summaryrefslogtreecommitdiffstats
path: root/images
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2013-12-01 22:21:08 +0000
committerColin Guthrie <colin@mageia.org>2013-12-02 00:04:26 +0000
commit073ec448d66a2fca506c9665ff1162fdd7356473 (patch)
treef80ab1101f762346ef6fd79f0a425259b3a2ecb3 /images
parent38a37508919ec7ee04bb740ee1b6a72011ab32cc (diff)
downloaddrakx-073ec448d66a2fca506c9665ff1162fdd7356473.tar
drakx-073ec448d66a2fca506c9665ff1162fdd7356473.tar.gz
drakx-073ec448d66a2fca506c9665ff1162fdd7356473.tar.bz2
drakx-073ec448d66a2fca506c9665ff1162fdd7356473.tar.xz
drakx-073ec448d66a2fca506c9665ff1162fdd7356473.zip
images: Allow the BOOT_AUTOMATIC_METHOD env var to work in rescue mode too
Diffstat (limited to 'images')
-rwxr-xr-ximages/make_boot_img2
1 files changed, 1 insertions, 1 deletions
diff --git a/images/make_boot_img b/images/make_boot_img
index 2ac8eb189..48f106e85 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -731,7 +731,7 @@ sub boot_iso {
output('.boot_iso/isolinux/isolinux.cfg', syslinux_cfg_all('', $with_gfxboot));
if ($ENV{BOOT_AUTOMATIC_METHOD}) {
- _ "sed -i 's|splash quiet\$|splash quiet automatic=$ENV{BOOT_AUTOMATIC_METHOD}|' .boot_iso/isolinux/isolinux.cfg"
+ _ "sed -i 's#\\(append .*\\)\\(splash quiet\\|rescue\\)\$#\\1\\2 automatic=$ENV{BOOT_AUTOMATIC_METHOD}#' .boot_iso/isolinux/isolinux.cfg"
}
_ "genisoimage -r -f -J -cache-inodes -V 'Mga Boot ISO' -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -o $iso .boot_iso";