diff options
Diffstat (limited to 'scripts/lib/wic')
-rw-r--r-- | scripts/lib/wic/kickstart/__init__.py | 7 | ||||
-rw-r--r-- | scripts/lib/wic/kickstart/custom_commands/wicboot.py | 5 |
2 files changed, 12 insertions, 0 deletions
diff --git a/scripts/lib/wic/kickstart/__init__.py b/scripts/lib/wic/kickstart/__init__.py index c9b0e51f3c..79b39fbf3f 100644 --- a/scripts/lib/wic/kickstart/__init__.py +++ b/scripts/lib/wic/kickstart/__init__.py | |||
@@ -97,6 +97,13 @@ def get_timeout(kickstart, default=None): | |||
97 | return default | 97 | return default |
98 | return int(kickstart.handler.bootloader.timeout) | 98 | return int(kickstart.handler.bootloader.timeout) |
99 | 99 | ||
100 | def get_bootloader_file(kickstart, default=None): | ||
101 | if not hasattr(kickstart.handler.bootloader, "configfile"): | ||
102 | return default | ||
103 | if kickstart.handler.bootloader.configfile is None: | ||
104 | return default | ||
105 | return kickstart.handler.bootloader.configfile | ||
106 | |||
100 | def get_kernel_args(kickstart, default="ro rd.live.image"): | 107 | def get_kernel_args(kickstart, default="ro rd.live.image"): |
101 | if not hasattr(kickstart.handler.bootloader, "appendLine"): | 108 | if not hasattr(kickstart.handler.bootloader, "appendLine"): |
102 | return default | 109 | return default |
diff --git a/scripts/lib/wic/kickstart/custom_commands/wicboot.py b/scripts/lib/wic/kickstart/custom_commands/wicboot.py index a3e1852be2..eb17dab6e1 100644 --- a/scripts/lib/wic/kickstart/custom_commands/wicboot.py +++ b/scripts/lib/wic/kickstart/custom_commands/wicboot.py | |||
@@ -35,6 +35,7 @@ class Wic_Bootloader(F8_Bootloader): | |||
35 | self.menus = "" | 35 | self.menus = "" |
36 | self.ptable = "msdos" | 36 | self.ptable = "msdos" |
37 | self.source = "" | 37 | self.source = "" |
38 | self.configfile = "" | ||
38 | 39 | ||
39 | def _getArgsAsStr(self): | 40 | def _getArgsAsStr(self): |
40 | retval = F8_Bootloader._getArgsAsStr(self) | 41 | retval = F8_Bootloader._getArgsAsStr(self) |
@@ -45,6 +46,8 @@ class Wic_Bootloader(F8_Bootloader): | |||
45 | retval += " --ptable=\"%s\"" %(self.ptable,) | 46 | retval += " --ptable=\"%s\"" %(self.ptable,) |
46 | if self.source: | 47 | if self.source: |
47 | retval += " --source=%s" % self.source | 48 | retval += " --source=%s" % self.source |
49 | if self.configfile: | ||
50 | retval += " --configfile=%s" % self.configfile | ||
48 | 51 | ||
49 | return retval | 52 | return retval |
50 | 53 | ||
@@ -56,5 +59,7 @@ class Wic_Bootloader(F8_Bootloader): | |||
56 | # use specified source plugin to implement bootloader-specific methods | 59 | # use specified source plugin to implement bootloader-specific methods |
57 | parser.add_option("--source", type="string", action="store", | 60 | parser.add_option("--source", type="string", action="store", |
58 | dest="source", default=None) | 61 | dest="source", default=None) |
62 | parser.add_option("--configfile", type="string", action="store", | ||
63 | dest="configfile", default=None) | ||
59 | return parser | 64 | return parser |
60 | 65 | ||