diff options
Diffstat (limited to 'scripts/contrib/mkefidisk.sh')
-rwxr-xr-x | scripts/contrib/mkefidisk.sh | 22 |
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 | |||
294 | mount $ROOTFS $ROOTFS_MNT || error "Failed to mount $ROOTFS on $ROOTFS_MNT" | 294 | mount $ROOTFS $ROOTFS_MNT || error "Failed to mount $ROOTFS on $ROOTFS_MNT" |
295 | mount $BOOTFS $BOOTFS_MNT || error "Failed to mount $BOOTFS on $BOOTFS_MNT" | 295 | mount $BOOTFS $BOOTFS_MNT || error "Failed to mount $BOOTFS on $BOOTFS_MNT" |
296 | 296 | ||
297 | echo "Copying ROOTFS files..." | ||
298 | cp -a $HDDIMG_ROOTFS_MNT/* $ROOTFS_MNT || error "Root FS copy failed" | ||
299 | |||
300 | echo "$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... | ||
303 | if [ -d $ROOTFS_MNT/etc/udev/ ] ; then | ||
304 | echo "$TARGET_DEVICE" >> $ROOTFS_MNT/etc/udev/mount.blacklist | ||
305 | fi | ||
306 | |||
307 | echo "Preparing boot partition..." | 297 | echo "Preparing boot partition..." |
308 | EFIDIR="$BOOTFS_MNT/EFI/BOOT" | 298 | EFIDIR="$BOOTFS_MNT/EFI/BOOT" |
309 | cp $HDDIMG_MNT/vmlinuz $BOOTFS_MNT || error "Failed to copy vmlinuz" | 299 | cp $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" |
357 | fi | 347 | fi |
358 | 348 | ||
349 | |||
350 | info "Copying ROOTFS files (this may take a while)" | ||
351 | cp -a $HDDIMG_ROOTFS_MNT/* $ROOTFS_MNT || die "Root FS copy failed" | ||
352 | |||
353 | echo "$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... | ||
356 | if [ -d $ROOTFS_MNT/etc/udev/ ] ; then | ||
357 | echo "$TARGET_DEVICE" >> $ROOTFS_MNT/etc/udev/mount.blacklist | ||
358 | fi | ||
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 |
360 | cleanup | 362 | cleanup |
361 | 363 | ||