summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2013-11-04 14:06:00 +0000
committerColin Guthrie <colin@mageia.org>2013-11-04 14:06:00 +0000
commitc386a93997aa2f3e233a273f8c7157e2ab26d217 (patch)
tree3b27037123ce311a5d225e981ac2800acf8cd169
parent9b27817656c02746ae230508631ebfb4334f6f57 (diff)
downloaddrakx-c386a93997aa2f3e233a273f8c7157e2ab26d217.tar
drakx-c386a93997aa2f3e233a273f8c7157e2ab26d217.tar.gz
drakx-c386a93997aa2f3e233a273f8c7157e2ab26d217.tar.bz2
drakx-c386a93997aa2f3e233a273f8c7157e2ab26d217.tar.xz
drakx-c386a93997aa2f3e233a273f8c7157e2ab26d217.zip
Revert "images: Use a generic, shared isolinux.cfg file."
-rw-r--r--images/isolinux.cfg8
-rwxr-xr-ximages/make_boot_img6
2 files changed, 2 insertions, 12 deletions
diff --git a/images/isolinux.cfg b/images/isolinux.cfg
deleted file mode 100644
index 1facfc8a3..000000000
--- a/images/isolinux.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-default detect
-label detect
- com32 ifcpu.c32
- append 64 -- x86_64 -- i586
-label x86_64
- config x86_64.cfg
-label i586
- config i586.cfg
diff --git a/images/make_boot_img b/images/make_boot_img
index ed4c5baec..b07776b27 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -682,8 +682,7 @@ sub isolinux {
_ "cp /usr/lib/syslinux/libmenu.c32 isolinux/libmenu.c32";
_ "cp /usr/lib/syslinux/libutil.c32 isolinux/libutil.c32";
_ "cp /usr/lib/syslinux/gfxboot.c32 isolinux/gfxboot.c32";
- output("isolinux/$arch.cfg", syslinux_cfg_all('cdrom', 1));
- _ "cp isolinux.cfg isolinux/";
+ output("isolinux/isolinux.cfg", syslinux_cfg_all('cdrom', 1));
xbox_stage1() if arch() =~ /i.86/;
}
@@ -728,8 +727,7 @@ sub boot_iso {
#_ "cp /home/teuf/mdv/src/mandriva-gfxboot-theme/inst/* .boot_iso/isolinux" if $with_gfxboot;
_ "cp /usr/lib/syslinux/gfxboot.c32 .boot_iso/isolinux/gfxboot.c32" if $with_gfxboot;
- output(".boot_iso/isolinux/$arch.cfg", syslinux_cfg_all('', $with_gfxboot));
- _ "cp isolinux.cfg .boot_iso/isolinux/";
+ output('.boot_iso/isolinux/isolinux.cfg', syslinux_cfg_all('', $with_gfxboot));
_ "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";