images: Use a generic, shared isolinux.cfg file.

This then loads a x86_64 or i586 config depending on the detected arch.

Anne asked for this kind of setup.

2 files changed, 12 insertions, 2 deletions

diff --git a/images/isolinux.cfg b/images/isolinux.cfg
new file mode 100644
index 000000000..1facfc8a3
--- /dev/null
+++ b/images/isolinux.cfg
@@ -0,0 +1,8 @@
+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 b096097aa..eb2146fa2 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -681,7 +681,8 @@ 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/isolinux.cfg", syslinux_cfg_all('cdrom', 1));
+    output("isolinux/$arch.cfg", syslinux_cfg_all('cdrom', 1));
+    _ "cp isolinux.cfg isolinux/";
 
     xbox_stage1() if arch() =~ /i.86/;
 }
@@ -726,7 +727,8 @@ 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/isolinux.cfg', syslinux_cfg_all('', $with_gfxboot));
+    output(".boot_iso/isolinux/$arch.cfg", syslinux_cfg_all('', $with_gfxboot));
+    _ "cp isolinux.cfg .boot_iso/isolinux/";
 
     _ "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";