Changeset 3480 in MondoRescue

Timestamp:

Oct 16, 2015, 4:05:28 PM (9 years ago)

Author:

Bruno Cornec

Message:

Create partition for GPT device and prepare loop device to mount it

File:

• branches/3.2/mindi/mindi (modified) (4 diffs)

branches/3.2/mindi/mindi

@@ -42 +42 @@
 
 EXTRA_SPACE=120000      # increase if you run out of ramdisk space
-BOOT_SIZE=86000         # size of the boot disk
+BOOT_SIZE=86000         # size of the boot disk in KB
 
 PROMPT_MAKE_CD_IMAGE="yes"
@@ -1925 +1925 @@
         # syslinux should be run on a  local file (doen't work through NFS Cf: #297)
         syslinux $imagefile >> $LOGFILE 2>> $LOGFILE
+        imagefile2=$imagefile
     fi
     if [ "$BOOT_TYPE" = "UEFI" ]; then
         # Should be GPT in that case to allow direct boot
         parted -s $imagefile mklabel gpt
+        parted -s $imagefile mkpart fat32 1 ${BOOT_SIZE}k 2> /dev/null
+        kpartx -a $imagefile
+        imagefile2=/dev/mapper/`kpartx -l $imagefile | awk '{print $1}'`
     fi
     LogFile "INFO: Creating vfat filesystem on $imagefile"
-    mkfs.vfat $imagefile >> $LOGFILE 2>> $LOGFILE
+    mkfs.vfat $imagefile2 >> $LOGFILE 2>> $LOGFILE
 
     # Only move it now to its final destination and use it now
@@ -1937 +1941 @@
     imagefile=$MINDI_CACHE/mindi-bootroot.img
 
-    mount -t vfat -o loop $imagefile $mountpoint || LogAll "ERROR: Cannot mount (PBDI)"
+    mount -t vfat -o loop $imagefile2 $mountpoint || LogAll "ERROR: Cannot mount (PBDI)"
 
     LogFile "INFO: Copying $MINDI_TMP/initrd.img to $mountpoint/initrd.img..."
@@ -2007 +2011 @@
         LogAll "WARNING: $BOOT_SIZE""KB boot disk was NOT created\n"
     fi
-    #[ "$imagefile" != "" ] && rm -f $imagefile
     [ "$retval" -ne "0" ] && LogAll "ERROR: PrepareBootDiskImage() is returning $retval"
     return $retval