Changeset 1684 in MondoRescue for branches/2.2.5/mindi/mindi

Timestamp:

Oct 20, 2007, 10:35:10 AM (17 years ago)

Author:

Bruno Cornec

Message:

Backport USB support for Key/disks from stable to 2.2.5 for mindi

File:

• branches/2.2.5/mindi/mindi (modified) (14 diffs)

branches/2.2.5/mindi/mindi

@@ -51 +51 @@
 PROMPT_MAKE_CD_IMAGE="yes"
     # Ask if you want to make a CD Image to be written?
+    # if this is set to 'no', then the image will be created automatically
+
+PROMPT_MAKE_USB_IMAGE="yes"
+    # Ask if you want to make a USB Image to be written?
     # if this is set to 'no', then the image will be created automatically
 
@@ -775 +779 @@
         [ "$modres" -eq "3" ] && echo -en "\t|"
     done
-    if [ _"$MONDO_SHARE" != _"" ] ; then
+    if [ _"$MONDO_SHARE" != _"" ]; then
         mkdir -p $bigdir/tmp
         mkdir -p $bigdir/sbin
@@ -1213 +1217 @@
     [ -e "$MY_FSTAB" ] || Die "Cannot find your fstab file ($MY_FSTAB)"
 
-    rm -f $mountlist
-    mkdir -p $mountlist
-    rm -Rf $mountlist
+    [ "$mountlist" != "" ] && rm -Rf $mountlist
     > $mountlist
     echo -en "\rHang on...\r"
@@ -1617 +1619 @@
 OfferToMakeBootableISO() {
     local i old_pwd
-    if [ "$PROMPT_MAKE_CD_IMAGE" = "yes" ] && [ _"$MONDO_SHARE" = _"" ] ; then
+    if [ "$PROMPT_MAKE_CD_IMAGE" = "yes" ] && [ _"$MONDO_SHARE" = _"" ]; then
         echo -en "Shall I make a bootable CD image? (y/[n]) "
         read i
@@ -1679 +1681 @@
     rm -f $MINDI_TMP/mkisofs.log
     cd $old_pwd
+}
+
+
+OfferToMakeBootableUSB() {
+    local i old_pwd
+    if [ "$PROMPT_MAKE_USB_IMAGE" = "yes" ] && [ _"$MONDO_SHARE" = _"" ]; then
+        echo "Shall I make a bootable USB image ?"
+        echo -en "WARNING: This will erase all content on $USBDEVICE (y/[n]) "
+        read i
+        [ "$i" != "y" ] && [ "$i" != "Y" ] && return 0
+    fi
+    if [ _"$MINDI_TMP" = _"" ]; then
+        Die "MINDI_TMP undefined"
+    fi
+    rm -Rf $MINDI_TMP/usb
+    mkdir -p $MINDI_TMP/usb
+    USBPART="${USBDEVICE}1"
+
+    echo -en "Transforming $USBDEVICE in a Bootable device " 
+    echo -en "."
+    echo "Transforming $USBDEVICE in a Bootable device"  >> $LOGFILE
+    echo "Checking $USBDEVICE" >> $LOGFILE
+    $FDISK -l $USBDEVICE 2>&1 >> $LOGFILE
+    if [ $? -ne 0 ]; then
+        echo "Unable to access $USBDEVICE" | tee -a $LOGFILE
+        echo "Make sure your USB device is pluged in" | tee -a $LOGFILE
+        exit -1
+    fi
+    echo -en "."
+    echo "Erasing $USBDEVICE" >> $LOGFILE
+    $FDISK $USBDEVICE 2>&1 >> $LOGFILE << EOF
+d
+d
+d
+d
+n
+p
+1
+
+
+t
+b
+a
+1
+w
+EOF
+    if [ $? -ne 0 ]; then
+        echo "Unable to create a vfat Filesystem on $USBDEVICE" | tee -a $LOGFILE
+        echo "Make sure your USB device is pluged in" | tee -a $LOGFILE
+        $FDISK -l $USBDEVICE 2>&1 | tee -a $LOGFILE
+        MindiExit -1
+    fi
+    echo -en "."
+    echo "Creating a vfat filesystem on $USBPART" >> $LOGFILE
+    mkfs -t vfat $USBPART 2>&1 >> $LOGFILE
+    if [ $? -ne 0 ]; then
+        echo "Unable to create a vfat filesystem on $USBPART" | tee -a $LOGFILE
+        echo "Make sure your USB device is pluged in and partitioned ($USBPART must exist on it)" | tee -a $LOGFILE
+        $FDISK -l $USBDEVICE 2>&1 | tee -a $LOGFILE
+        MindiExit -1
+    fi
+    echo -en "."
+    echo "Mounting $USBPART on $MINDI_TMP/usb" >> $LOGFILE
+    mount $USBPART $MINDI_TMP/usb 2>> $LOGFILE
+    if [ $? -ne 0 ]; then
+        echo "Unable to mount $USBPART on $MINDI_TMP/usb" | tee -a $LOGFILE
+        echo "Make sure your USB device is pluged in, partitioned and formated ($USBPART must exist on it)" | tee -a $LOGFILE
+        $FDISK -l $USBDEVICE 2>&1 | tee -a $LOGFILE
+        MindiExit -1
+    fi
+    echo -en "."
+    mkdir -p $MINDI_TMP/usb/{images,archives}
+    cp -f $1/*.img $1/*.gz $MINDI_TMP/usb/images 2>> $LOGFILE || LogIt "OfferToMakeBootableUSB: Cannot copy $i to $MINDI_TMP/iso/images"
+    echo -en "."
+    old_pwd=`pwd`
+    cd $MINDI_TMP/usb
+    echo "mindi_lib = $MINDI_LIB" >> $LOGFILE
+    for i in memdisk memtest.bin memtest.img ; do
+        j=$MINDI_LIB/$i
+        k=$MINDI_TMP/usb
+        if [ -e "$j" ] ; then
+            LogIt "Copying $j to $k"
+            cp -f $j $k 2> /dev/null || Die "Failed to copy $j to $k"
+            cp -f $j $MINDI_TMP 2> /dev/null || Die "Failed to copy $j to $MINDI_TMP"
+            if [ _"$MONDO_SHARE" != _"" ]; then
+                cp -f $j $MONDO_ROOT 2>> $LOGFILE || Die "Failed to copy $j to $MONDO_ROOT"
+            fi
+        fi
+    done
+    echo -en "."
+    MakeSyslinuxMessageFile $MINDI_TMP/usb/message.txt
+    echo -en "."
+    cp $kernelpath $MINDI_TMP/usb/vmlinuz 2> /dev/null || Die "Cannot copy vmlinuz ($kernelpath) to mindi tmp ($MINDI_TMP/usb/syslinux/vmlinuz). Did you run out of disk space?"
+    echo -en "."
+    cp $MINDI_TMP/mindi.rdz $MINDI_TMP/usb/initrd.img 2>> $LOGFILE
+    echo -en "."
+    if [ _"$MONDO_SHARE" != _"" ]; then
+        cp $kernelpath $MONDO_ROOT/vmlinuz 2> /dev/null || 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> /dev/null || Die "Cannot copy mindi.rdz ($MINDI_TMP) to mondo root ($MONDO_ROOT/initrd.img). Did you run out of disk space?"
+
+    fi
+    echo -en "."
+    [ -e "$iso_cfg_file" ] || Die "FIXME - unable to find $iso_cfg_file - this should never occur"
+    cat $sys_cfg_file | HackSyslinuxFile $ramdisk_size $MINDI_TMP/usb > syslinux.cfg || Die "Cannot copy syslinux.cfg from mindi_home to $MINDI_TMP/usb - did you run out of disk space?"
+    echo -en "."
+    if [ "$NFS_DEV" != "" ] ; then
+        perl -pi -e 's/interactive/iso/' syslinux.cfg
+    fi
+    cd $old_pwd
+    echo -en "."
+    if [ "$ARCH" != "ia64" ] ; then
+        if [ _"$MONDO_SHARE" != _"" ]; then
+            cp -f $MINDI_TMP/usb/{syslinux.cfg,initrd.img,vmlinuz,message.txt} $MONDO_ROOT 2>> $LOGFILE || Die "Cannot copy core files to ramdisk for boot disk (under $MONDO_ROOT). Did you run out of disk space?"
+            cp -f $MONDO_SHARE/autorun $MONDO_ROOT 2>> $LOGFILE
+        fi
+        umount $MINDI_TMP/usb
+        syslinux $USBPART 2>> $MINDI_TMP/syslinux.log
+        if [ "$?" -ne "0" ] ; then
+            echo "----------- syslinux's errors --------------" |tee -a $LOGFILE
+            cat $MINDI_TMP/syslinux.log |tee -a $LOGFILE
+            LogIt "Failed to create USB image."
+        else
+            echo -e "$DONE"
+            echo "Created bootable USB image on $USBDEVICE" >> $LOGFILE
+        fi
+        rm -f $MINDI_TMP/syslinux.log
+    else
+        echo "No USB boot support for ia64" | tee -a $LOGFILE
+        umount $MINDI_TMP/usb
+        MindiExit -1
+    fi
+    echo -en "."
+    #
+    # If mondoarchive, then tranfer $MINDI_CACHE content to the USB device 
+    # and mount that device under that mountpoint instead 
+    # Has to be done at the end here.
+    #
+    if [ _"$MONDO_SHARE" != _"" ]; then
+        mount $USBPART $MINDI_TMP/usb 2>> $LOGFILE
+        mv $CACHE_LOC/* $MINDI_TMP/usb
+        umount $MINDI_TMP/usb
+        mount $USBPART $CACHE_LOC
+    fi
 }
 
@@ -2785 +2930 @@
     cd $minidir_root/all
     size_of_all_tools=`du -sk . | cut -f1`
-    if [ _"$MONDO_SHARE" != _"" ] ; then
+    if [ _"$MONDO_SHARE" != _"" ]; then
         for q in filelist.full.gz biggielist.txt ; do
             [ ! -e "$MINDI_TMP/$q" ] && Die "Cannot find $MINDI_TMP/$q"
@@ -2814 +2959 @@
 echo "$@" >> $LOGFILE
 echo "Start date : `date`" >> $LOGFILE
+echo "-----------------------------" >> $LOGFILE
 
 if [ -e "/etc/conf.modules" ] && [ ! -e "/etc/modules.conf" ] ; then
@@ -2852 +2998 @@
 # /etc/modprobe.conf which is exactly what module-init-tools does. The temporary
 # modprobe.conf file is created in MakeModuleLoadingScript. AL041128.
-if [ -d "/etc/modprobe.d" ] && [ `uname -r | cut -c1-3` = "2.6" ] ; then
+if [ -d "/etc/modprobe.d" ] && [ "`uname -r | cut -c1-3`" = "2.6" ] ; then
     TMPMODPROBE_FLAG="Y"
 else
@@ -2962 +3108 @@
 done
 
+#
+# If we have a USB device we need to store info 
+# and remove it from the parameters line
+#
+if [ "$#" -ne "0" ] ; then
+    if [ "$1" = "--usb" ] ; then
+        shift
+        USBDEVICE=$1
+        if [ _"$USBDEVICE" = _"" ]; then
+            Die "No USB device specified"
+        fi
+        shift
+    fi
+fi
+
 if [ "$#" -ne "0" ] ; then
     if [ "$1" = "--findkernel" ] ; then
@@ -3078 +3239 @@
 
 [ -e "$iso_cfg_file" ] || Die "Cannot find $iso_cfg_file"
-if [ _"$MONDO_SHARE" = _"" ] ; then
+if [ _"$MONDO_SHARE" = _"" ]; then
     LogIt "Mindi Linux mini-distro generator v$MINDI_VERSION"
     LogIt "Latest Mindi is available from http://www.mondorescue.org"
@@ -3117 +3278 @@
 fi
 
+if [ "$PROMPT_MAKE_USB_IMAGE" = "yes" ]; then
+    LogIt "Including the generation of a Bootable USB device on $USBDEVICE"
+fi
+
 if [ "$kernelpath" = "" ] ; then
     [ _"$MONDO_SHARE" != _"" ] && Die "Please use -k <path> to specify kernel."
@@ -3196 +3361 @@
 ...Or type 'memtest' to test your PC's RAM thoroughly.\n"
 
-if [ _"$MONDO_SHARE" = _"" ] ; then
+if [ _"$MONDO_SHARE" = _"" ]; then
     ListImagesForUser $CACHE_LOC
     boot_dev=/dev/fd0u1722
@@ -3205 +3370 @@
         OfferToCopyImagesToDisks $CACHE_LOC $boot_dev $FDDEVICE
     fi
+    if [ "$PROMPT_MAKE_USB_IMAGE" = "yes" ]; then
+        OfferToMakeBootableUSB $CACHE_LOC
+    fi
     OfferToMakeBootableISO $CACHE_LOC
     LogIt "Finished."
@@ -3214 +3382 @@
         Die "Cannot find all.tar.gz, to be written to tape"
     fi
+elif [ "$PROMPT_MAKE_USB_IMAGE" = "yes" ]; then
+    OfferToMakeBootableUSB $CACHE_LOC
 else
     OfferToMakeBootableISO $CACHE_LOC