summaryrefslogtreecommitdiffstats
path: root/scripts/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/contrib')
-rwxr-xr-xscripts/contrib/mkefidisk.sh14
1 files changed, 12 insertions, 2 deletions
diff --git a/scripts/contrib/mkefidisk.sh b/scripts/contrib/mkefidisk.sh
index af06b4bd5b..c86849d395 100755
--- a/scripts/contrib/mkefidisk.sh
+++ b/scripts/contrib/mkefidisk.sh
@@ -134,6 +134,11 @@ fi
134# Partition $DEVICE 134# Partition $DEVICE
135# 135#
136DEVICE_SIZE=$(parted $DEVICE unit mb print | grep ^Disk | cut -d" " -f 3 | sed -e "s/MB//") 136DEVICE_SIZE=$(parted $DEVICE unit mb print | grep ^Disk | cut -d" " -f 3 | sed -e "s/MB//")
137# If the device size is not reported there may not be a valid label
138if [ "$DEVICE_SIZE" = "" ] ; then
139 parted $DEVICE mklabel msdos
140 DEVICE_SIZE=$(parted $DEVICE unit mb print | grep ^Disk | cut -d" " -f 3 | sed -e "s/MB//")
141fi
137SWAP_SIZE=$((DEVICE_SIZE*SWAP_RATIO/100)) 142SWAP_SIZE=$((DEVICE_SIZE*SWAP_RATIO/100))
138ROOTFS_SIZE=$((DEVICE_SIZE-BOOT_SIZE-SWAP_SIZE)) 143ROOTFS_SIZE=$((DEVICE_SIZE-BOOT_SIZE-SWAP_SIZE))
139ROOTFS_START=$((BOOT_SIZE)) 144ROOTFS_START=$((BOOT_SIZE))
@@ -142,7 +147,7 @@ SWAP_START=$((ROOTFS_END))
142 147
143# MMC devices use a partition prefix character 'p' 148# MMC devices use a partition prefix character 'p'
144PART_PREFIX="" 149PART_PREFIX=""
145if [ ! "${DEVICE#/dev/mmcblk}" = "${DEVICE}" ]; then 150if [ ! "${DEVICE#/dev/mmcblk}" = "${DEVICE}" ] || [ ! "${DEVICE#/dev/loop}" = "${DEVICE}" ]; then
146 PART_PREFIX="p" 151 PART_PREFIX="p"
147fi 152fi
148BOOTFS=$DEVICE${PART_PREFIX}1 153BOOTFS=$DEVICE${PART_PREFIX}1
@@ -197,7 +202,12 @@ unmount_device
197# 202#
198echo "" 203echo ""
199echo "Formatting $BOOTFS as vfat..." 204echo "Formatting $BOOTFS as vfat..."
200mkfs.vfat $BOOTFS -n "efi" 205if [ ! "${DEVICE#/dev/loop}" = "${DEVICE}" ]; then
206 mkfs.vfat -I $BOOTFS -n "efi"
207else
208 mkfs.vfat $BOOTFS -n "efi"
209
210fi
201 211
202echo "Formatting $ROOTFS as ext3..." 212echo "Formatting $ROOTFS as ext3..."
203mkfs.ext3 $ROOTFS -L "root" 213mkfs.ext3 $ROOTFS -L "root"