external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3336 from iiab/revert-3160-expand-rootfs-avoid-reboot

Browse source 
Revert "1-prep/templates/iiab-expand-rootfs: Avoid reboot"
This commit is contained in:
A Holt 2022-08-07 08:57:42 -04:00 • committed by GitHub
commit 4d41c12338
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
roles/1-prep/templates/iiab-expand-rootfs
View file

@ -11,11 +11,11 @@
if [ -f /.expand-rootfs ] || [ -f /.resize-rootfs ]; then
echo "$0: Expanding rootfs partition"
# if [ -x /usr/bin/raspi-config ]; then # Raspberry Pi OS
# # 2022-02-17: Uses do_expand_rootfs() from:
# # https://github.com/RPi-Distro/raspi-config/blob/master/raspi-config
# raspi-config --expand-rootfs # REQUIRES A REBOOT
# else # REQUIRES NO REBOOT; works on all OS's
if [ -x /usr/bin/raspi-config ]; then # Raspberry Pi OS
# 2022-02-17: Uses do_expand_rootfs() from:
# https://github.com/RPi-Distro/raspi-config/blob/master/raspi-config
raspi-config --expand-rootfs # REQUIRES A REBOOT
else # REQUIRES NO REBOOT; BEWARE iiab-expand-rootfs.service RACE CONDITION WITH fsck (PR #2522 & #3325)
# 2022-03-15: Borrows from above raspi-config URL's do_expand_rootfs()
ROOT_PART="$(findmnt / -o SOURCE -n)" # e.g. /dev/sda2 or /dev/mmcblk0p2
ROOT_DEV="/dev/$(lsblk -no pkname "$ROOT_PART")" # e.g. /dev/sda or /dev/mmcblk0
@ -53,7 +53,7 @@ if [ -f /.expand-rootfs ] || [ -f /.resize-rootfs ]; then
# # Resize partition
# growpart /dev/$root_dev $root_part_no
# resize2fs /dev/$root_part
# fi
fi
rm -f /.expand-rootfs /.resize-rootfs
fi