summaryrefslogtreecommitdiffstats
path: root/images
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2013-11-13 11:39:34 +0100
committerColin Guthrie <colin@mageia.org>2013-11-13 12:35:41 +0100
commit9c8e358edad9ec6b7b0569113f5448b0f3a19faa (patch)
tree9cf75501d337bd53f3545fbc113346ecd59348ec /images
parent5ad105eaea1d6be9170593af2e4af8c7debee481 (diff)
downloaddrakx-9c8e358edad9ec6b7b0569113f5448b0f3a19faa.tar
drakx-9c8e358edad9ec6b7b0569113f5448b0f3a19faa.tar.gz
drakx-9c8e358edad9ec6b7b0569113f5448b0f3a19faa.tar.bz2
drakx-9c8e358edad9ec6b7b0569113f5448b0f3a19faa.tar.xz
drakx-9c8e358edad9ec6b7b0569113f5448b0f3a19faa.zip
images: Add a way to put an automatic method on boot.iso syslinux for testing
Diffstat (limited to 'images')
-rw-r--r--images/NEWS2
-rwxr-xr-ximages/make_boot_img4
2 files changed, 6 insertions, 0 deletions
diff --git a/images/NEWS b/images/NEWS
index fbb047944..eab97dad3 100644
--- a/images/NEWS
+++ b/images/NEWS
@@ -1,3 +1,5 @@
+- add BOOT_AUTOMATIC_METHOD to inject command line params into boot.iso syslinux
+
Version 2.1 - 5 November 2013 by Colin Guthrie
- revert back to static per-arch isolinux.cfg files
diff --git a/images/make_boot_img b/images/make_boot_img
index b07776b27..457572ca0 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -729,6 +729,10 @@ 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"
+ }
+
_ "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";
_ "isohybrid -o 1 $iso";
rm_rf('.boot_iso');