diff options
Diffstat (limited to 'scripts/lib/wic/plugins/source/bootimg-pcbios.py')
-rw-r--r-- | scripts/lib/wic/plugins/source/bootimg-pcbios.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py index 80c7dfb65e..255684b386 100644 --- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py +++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py | |||
@@ -105,14 +105,9 @@ class BootimgPcbiosPlugin(SourcePlugin): | |||
105 | else: | 105 | else: |
106 | splashline = "" | 106 | splashline = "" |
107 | 107 | ||
108 | options = creator.ks.handler.bootloader.appendLine | ||
109 | |||
110 | syslinux_conf = "" | 108 | syslinux_conf = "" |
111 | syslinux_conf += "PROMPT 0\n" | 109 | syslinux_conf += "PROMPT 0\n" |
112 | timeout = kickstart.get_timeout(creator.ks) | 110 | syslinux_conf += "TIMEOUT " + str(bootloader.timeout) + "\n" |
113 | if not timeout: | ||
114 | timeout = 0 | ||
115 | syslinux_conf += "TIMEOUT " + str(timeout) + "\n" | ||
116 | syslinux_conf += "\n" | 111 | syslinux_conf += "\n" |
117 | syslinux_conf += "ALLOWOPTIONS 1\n" | 112 | syslinux_conf += "ALLOWOPTIONS 1\n" |
118 | syslinux_conf += "SERIAL 0 115200\n" | 113 | syslinux_conf += "SERIAL 0 115200\n" |
@@ -126,7 +121,7 @@ class BootimgPcbiosPlugin(SourcePlugin): | |||
126 | syslinux_conf += "KERNEL " + kernel + "\n" | 121 | syslinux_conf += "KERNEL " + kernel + "\n" |
127 | 122 | ||
128 | syslinux_conf += "APPEND label=boot root=%s %s\n" % \ | 123 | syslinux_conf += "APPEND label=boot root=%s %s\n" % \ |
129 | (creator.rootdev, options) | 124 | (creator.rootdev, bootloader.append) |
130 | 125 | ||
131 | msger.debug("Writing syslinux config %s/hdd/boot/syslinux.cfg" \ | 126 | msger.debug("Writing syslinux config %s/hdd/boot/syslinux.cfg" \ |
132 | % cr_workdir) | 127 | % cr_workdir) |