Skip to content

Commit 175a25b

Browse files
committed
aii/server/config: configure grub2_efi_kernel_root if AII_EFI_KERNEL_ROOT is defined
1 parent fe6c43b commit 175a25b

File tree

1 file changed

+34
-28
lines changed

1 file changed

+34
-28
lines changed

quattor/aii/server/config.pan

Lines changed: 34 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -19,38 +19,44 @@ prefix '/software/components/aiiserver/aii-shellfe';
1919
'cdburl' ?= QUATTOR_PROFILE_URL;
2020

2121
'profile_prefix' ?= if (is_defined(AII_PROFILE_PREFIX) && (length(AII_PROFILE_PREFIX) > 0)) {
22-
AII_PROFILE_PREFIX;
23-
} else {
24-
null;
25-
};
22+
AII_PROFILE_PREFIX;
23+
} else {
24+
null;
25+
};
2626

2727
'profile_format' ?= if ( is_defined(QUATTOR_PROFILE_FORMAT) ) {
28-
QUATTOR_PROFILE_FORMAT;
29-
} else {
30-
null;
31-
};
28+
QUATTOR_PROFILE_FORMAT;
29+
} else {
30+
null;
31+
};
3232

3333
'use_fqdn' ?= if (is_defined(AII_USE_FQDN) ) {
34-
if ( AII_USE_FQDN) {
35-
true;
36-
} else {
37-
false;
38-
};
39-
} else {
40-
null;
41-
};
34+
if ( AII_USE_FQDN) {
35+
true;
36+
} else {
37+
false;
38+
};
39+
} else {
40+
null;
41+
};
4242

4343
'osinstalldir' ?= if ( is_defined(AII_OSINSTALL_DIR) ) {
44-
AII_OSINSTALL_DIR;
45-
} else {
46-
null;
47-
};
44+
AII_OSINSTALL_DIR;
45+
} else {
46+
null;
47+
};
4848

4949
'nbpdir' ?= if ( is_defined(AII_NBP_DIR) ) {
50-
AII_NBP_DIR;
51-
} else {
52-
null;
53-
};
50+
AII_NBP_DIR;
51+
} else {
52+
null;
53+
};
54+
55+
'grub2_efi_kernel_root' ?= if ( is_defined(AII_EFI_KERNEL_ROOT) ) {
56+
AII_EFI_KERNEL_ROOT;
57+
} else {
58+
null;
59+
};
5460

5561

5662

@@ -61,9 +67,9 @@ prefix '/software/components/aiiserver/aii-dhcp';
6167
'dhcpconf' ?= AII_DHCP_DHCPD_CONF_FILE;
6268

6369
'restartcmd' ?= if ( is_defined(AII_DHCP_RESTART_CMD) ) {
64-
AII_DHCP_RESTART_CMD;
65-
} else {
66-
null;
67-
};
70+
AII_DHCP_RESTART_CMD;
71+
} else {
72+
null;
73+
};
6874

6975
include AII_DHCP_CONFIG_SITE;

0 commit comments

Comments
 (0)