Changeset 1929 in MondoRescue

Timestamp:

Apr 21, 2008, 1:02:10 AM (16 years ago)

Author:

Bruno Cornec

Message:

Fix a problem in case of initramfs type of boot file in the path of the file generated

File:

• branches/2.2.6/mindi/mindi (modified) (2 diffs)

branches/2.2.6/mindi/mindi

@@ -1444 +1444 @@
     MakeSyslinuxMessageFile $MINDI_TMP/iso/isolinux/message.txt
     cp $kernelpath $MINDI_TMP/iso/isolinux/vmlinuz 2>> $LOGFILE || Die "Cannot copy vmlinuz ($kernelpath) to mindi tmp ($MINDI_TMP/iso/isolinux/vmlinuz). Did you run out of disk space?"
-    cp $MINDI_TMP/mindi.rdz $MINDI_TMP/iso/isolinux/initrd.img 2>> $LOGFILE
+    cp $MINDI_TMP/mindi.rdz $MINDI_TMP/iso/isolinux/initrd.img 2>> $LOGFILE || Die "Cannot copy mindi.rdz ($MINDI_TMP/mindi.rdz) to $MINDI_TMP/iso/isolinux/initrd.img. Did you run out of disk space?"
     if [ _"$MONDO_SHARE" != _"" ]; then 
-        cp $kernelpath $MONDO_ROOT/vmlinuz 2>> $LOGFILE || Die "Cannot copy vmlinuz ($kernelpath) to mondo root ($MONDO_ROOT/vmlinuz). Did you run out of disk space?"/dev/null 
-        cp $MINDI_TMP/mindi.rdz $MONDO_ROOT/initrd.img 2>> $LOGFILE || Die "Cannot copy mindi.rdz ($MINDI_TMP/mindi.rdz) to mondo root ($MONDO_ROOT/vmlinuz). Did you run out of disk space?"
-
+        cp $kernelpath $MONDO_ROOT/vmlinuz 2>> $LOGFILE || Die "Cannot copy vmlinuz ($kernelpath) to mondo root ($MONDO_ROOT/vmlinuz). Did you run out of disk space?"
+        cp $MINDI_TMP/mindi.rdz $MONDO_ROOT/initrd.img 2>> $LOGFILE || Die "Cannot copy mindi.rdz ($MINDI_TMP/mindi.rdz) to $MONDO_ROOT/initrd.img. Did you run out of disk space?"
     fi
     [ -e "$iso_cfg_file" ] || Die "FIXME - unable to find $iso_cfg_file - this should never occur"
@@ -2550 +2549 @@
         ln -sf sbin/init init
         # create cpio image file and unmount loop filesystem
-        find . -print | cpio -o -H newc | gzip -9 > $old_pwd/$rdz_fname 2> /dev/null
+        find . -print | cpio -o -H newc | gzip -9 > $rdz_fname 2> /dev/null
         cd $old_pwd
         umount $mountpoint || Die "Cannot unmount $tempfile"