Merge pull request #1269 from OSInside/fix_oem_reboot

Fixed subsequent reboot of oem disk
This commit is contained in:
Marcus Schäfer 2019-11-20 08:17:40 +01:00 committed by GitHub
commit c8a28440ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -279,14 +279,6 @@ PATH=/usr/sbin:/usr/bin:/sbin:/bin
setup_debug
# initialize for disk repartition
initialize
if ! disk_has_unallocated_space "${disk}";then
# already resized or disk has not received any geometry change
return
fi
# when repartitioning disks, parted and friends might trigger re-reads of
# the partition table, in turn triggering systemd-fsck-root.service
# repeatedly via udev events, which finally can cause booting to fail with
@ -303,6 +295,14 @@ trap unmask_fsck_root_service EXIT
mask_fsck_root_service
# initialize for disk repartition
initialize
if ! disk_has_unallocated_space "${disk}";then
# already resized or disk has not received any geometry change
return
fi
# prepare disk for repartition
if [ "$(get_partition_table_type "${disk}")" = 'gpt' ];then
relocate_gpt_at_end_of_disk "${disk}"