Changeset 2073 in MondoRescue

Timestamp:

Dec 8, 2008, 1:24:15 PM (16 years ago)

Author:

Bruno Cornec

Message:

• fdomain may prevent booting at restore time, so propose it as example of DENY_MODS
• adds a new target to MakeBootConfFile, in order to support isolinux and syslinux separately. That should allow creation of USB keys correctly, as syslinux syntax in syslinux.cfg is without / for kernel and initrd pathnames, where we use a full path syntax for CD/Isolinux.

File:

• branches/2.2.8/mindi/mindi (modified) (7 diffs)

branches/2.2.8/mindi/mindi

@@ -59 +59 @@
 EXTRA_MODS="$CDROM_MODS vfat fat loop md-mod linear raid0 raid1 xor raid5 raid456 lvm-mod dm-mod dm_mod dm-snapshot dm_snapshot dm-zero dm_zero dm-mirror dm_mirror dm-multipath dm-round-robin jfs xfs xfs_support pagebuf reiserfs ext2 ext3 minix nfs nfs_acl nfsd lockd sunrpc jbd mbcache"
 # Replace with that line for HP OCMP e.g.
-#DENY_MODS="MPS_Driver_Mapper mps octtldrv tscttl streams kqemu"
+#DENY_MODS="MPS_Driver_Mapper mps octtldrv tscttl streams kqemu fdomain"
 DENY_MODS="kqemu"
 # Force some modules to be included
@@ -1311 +1311 @@
         cp $MINDI_TMP/initrd.img $MONDO_ROOT/initrd.img 2>> $LOGFILE || Die "Cannot copy initrd.img ($MINDI_TMP/initrd.img) to $MONDO_ROOT/initrd.img. Did you run out of disk space?"
     fi
-    MakeBootConfFile syslinux > $MINDI_TMP/iso/isolinux.cfg
+    MakeBootConfFile isolinux > $MINDI_TMP/iso/isolinux.cfg
     if [ "$ARCH" != "ia64" ] ; then
         cp $ISOLINUX $MINDI_TMP/iso/isolinux.bin 2> /dev/null || Die "Cannot copy isolinux.bin ($ISOLINUX) to $MINDI_TMP/iso - did you run out of disk space?"
@@ -1555 +1555 @@
             outstr="image=/vmlinuz\n\tlabel=$i\n\tinitrd=/initrd.img\n\troot=/dev/ram0 append=\" rw ramdisk_size=$ramdisk_size $ooo_mode $ADDITIONAL_BOOT_PARAMS \"\n"
         else
-            outstr="label $i\n\tkernel /vmlinuz\n\tappend initrd=/initrd.img root=/dev/ram0 rw ramdisk_size=$ramdisk_size ${ooo}_mode $ADDITIONAL_BOOT_PARAMS\n"
+            ps="/"
+            if [ "$type" = "syslinux" ]; then
+                ps=""
+            fi
+            outstr="label $i\n\tkernel ${ps}vmlinuz\n\tappend initrd=${ps}initrd.img root=/dev/ram0 rw ramdisk_size=$ramdisk_size ${ooo}_mode $ADDITIONAL_BOOT_PARAMS\n"
         fi
         echo -en "$outstr"
@@ -1563 +1567 @@
         if [ "$type" = "elilo" ]; then
             echo -en "image=/memtest.bin\n\tlabel=memtest\n"
-            echo -en "image=/memdisk\n\tlabel=memtest\nappend=\"initrd=memtest.img\"\n"
+            echo -en "image=/memdisk\n\tlabel=memdisk\nappend=\"initrd=memtest.img\"\n"
         else
-            echo -en "label memtest\n\tkernel /memtest.bin\n"
-            echo -en "label=memtest\n\tkernel /memdisk\nappend initrd=memtest.img\n"
+            ps="/"
+            if [ "$type" = "syslinux" ]; then
+                ps=""
+            fi
+            echo -en "label memtest\n\tkernel ${ps}memtest.bin\n"
+            echo -en "label memdisk\n\tkernel ${ps}memdisk\nappend initrd=${ps}memtest.img\n"
         fi
     fi
@@ -1678 +1686 @@
 
 
-PrepareBootDiskImage_SYSLINUX() {
+PrepareBootDiskImage_ISOLINUX() {
     local imagesdir dev imagefile mountpoint fname i kernelpath cfg_file testpath options retval outstr old_pwd ooo max_kernel_size bootimage
     imagesdir=$MINDI_CACHE
@@ -1707 +1715 @@
     # copy Mindi's skeleton fs & lilo/syslinux/whatever stuff into it
     MakeMessageFile > $mountpoint/message.txt
-    MakeBootConfFile syslinux > $mountpoint/syslinux.cfg
+    MakeBootConfFile isolinux > $mountpoint/syslinux.cfg
     echo "Copying $MINDI_TMP/initrd.img to $mountpoint/initrd.img..." >> $LOGFILE
     cp -f $MINDI_TMP/initrd.img $mountpoint/initrd.img 2>> $LOGFILE
@@ -2819 +2827 @@
     PrepareBootDiskImage_LILO $kernelpath || Die "Failed to create ia64 image disk image."
 else
-    PrepareBootDiskImage_SYSLINUX $kernelpath || Die "Failed to create $ramdisk_size MB disk image."
+    PrepareBootDiskImage_ISOLINUX $kernelpath || Die "Failed to create $ramdisk_size MB disk image."
 fi