summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/contrib/mkefidisk.sh22
1 files changed, 12 insertions, 10 deletions
diff --git a/scripts/contrib/mkefidisk.sh b/scripts/contrib/mkefidisk.sh
index 6cc6b78de2..85e58ef865 100755
--- a/scripts/contrib/mkefidisk.sh
+++ b/scripts/contrib/mkefidisk.sh
@@ -294,16 +294,6 @@ mount -o loop $HDDIMG_MNT/rootfs.img $HDDIMG_ROOTFS_MNT || error "Failed to moun
294mount $ROOTFS $ROOTFS_MNT || error "Failed to mount $ROOTFS on $ROOTFS_MNT" 294mount $ROOTFS $ROOTFS_MNT || error "Failed to mount $ROOTFS on $ROOTFS_MNT"
295mount $BOOTFS $BOOTFS_MNT || error "Failed to mount $BOOTFS on $BOOTFS_MNT" 295mount $BOOTFS $BOOTFS_MNT || error "Failed to mount $BOOTFS on $BOOTFS_MNT"
296 296
297echo "Copying ROOTFS files..."
298cp -a $HDDIMG_ROOTFS_MNT/* $ROOTFS_MNT || error "Root FS copy failed"
299
300echo "$TARGET_SWAP swap swap defaults 0 0" >> $ROOTFS_MNT/etc/fstab
301
302# We dont want udev to mount our root device while we're booting...
303if [ -d $ROOTFS_MNT/etc/udev/ ] ; then
304 echo "$TARGET_DEVICE" >> $ROOTFS_MNT/etc/udev/mount.blacklist
305fi
306
307echo "Preparing boot partition..." 297echo "Preparing boot partition..."
308EFIDIR="$BOOTFS_MNT/EFI/BOOT" 298EFIDIR="$BOOTFS_MNT/EFI/BOOT"
309cp $HDDIMG_MNT/vmlinuz $BOOTFS_MNT || error "Failed to copy vmlinuz" 299cp $HDDIMG_MNT/vmlinuz $BOOTFS_MNT || error "Failed to copy vmlinuz"
@@ -356,6 +346,18 @@ if [ ! -e $GRUB_CFG ] && [ ! -e $GUMMI_CFG ]; then
356 die "No EFI bootloader configuration found" 346 die "No EFI bootloader configuration found"
357fi 347fi
358 348
349
350info "Copying ROOTFS files (this may take a while)"
351cp -a $HDDIMG_ROOTFS_MNT/* $ROOTFS_MNT || die "Root FS copy failed"
352
353echo "$TARGET_SWAP swap swap defaults 0 0" >> $ROOTFS_MNT/etc/fstab
354
355# We dont want udev to mount our root device while we're booting...
356if [ -d $ROOTFS_MNT/etc/udev/ ] ; then
357 echo "$TARGET_DEVICE" >> $ROOTFS_MNT/etc/udev/mount.blacklist
358fi
359
360
359# Call cleanup to unmount devices and images and remove the TMPDIR 361# Call cleanup to unmount devices and images and remove the TMPDIR
360cleanup 362cleanup
361 363