Automatically compute the minimum size for the partition and resize it during the boot process (#127)
* Automatically compute the minimum size for the partitions * Automatically resize the pmOS_root partition during the boot process * Resize root partition only if there is unallocated space at the end of the device. * Added more echos to make debugging easier while looking at the pmOS_init.log. * Updated static_code_analysis.sh script to run shellcheck with `-x` option.
This commit is contained in:
drebrez
Oliver Smith
parent
94055072d4
commit
4a3a02c60a
4 changed files with 86 additions and 35 deletions
|
|
@ -1,5 +1,5 @@
|
|||
pkgname=postmarketos-mkinitfs
|
||||
pkgver=0.2.0
|
||||
pkgver=0.3.0
|
||||
pkgrel=1
|
||||
pkgdesc="Tool to generate initramfs images for postmarketOS"
|
||||
url="https://github.com/postmarketOS"
|
||||
|
|
@ -25,6 +25,6 @@ package() {
|
|||
"$pkgdir/sbin/mkinitfs"
|
||||
mkdir -p "$pkgdir/etc/postmarketos-mkinitfs/hooks/"
|
||||
}
|
||||
sha512sums="318f4d925df001c1f7378c1577332fba4964bbd822c1b050c41b908c2eb37365c418e1efb6f329cf51c515b34ef3e97d1b9e8cc85509f1cefea1015b3c9db663 init.sh.in
|
||||
ccd05065a8f66f181351987740dff62b5a38f21aa764a3dbdb4601c494e756a5885ff17f69a6916eaae28498cd3c79d49e5962190ee0affd389f8f584dbaa3c2 init_functions.sh
|
||||
e0255a5e7debe41efe97a3a156ef866ec5e3e9f6d57d20c0acd889470501179a9eace709afa3b98d46d513c47113701ac5b17fbf116642e683972db91a4b4824 mkinitfs.sh"
|
||||
sha512sums="95e49eb5e7891d319543165290fb7279733e696db8c768d864d87ef36a20b04e1c4e8a1702a2927e7492ea2e9f3d4fdd83d9ea55811969689b9c2483fb3b44c4 init.sh.in
|
||||
66207a12dba2be8868d080e69e54dce43c8a3edbbd08a6585f8ad49034e32bbe9184c4c77b5fe49049d7475f930781f48919a12eb4d82c9e0008f6fa6da0d035 init_functions.sh
|
||||
9bf70dda59c4c64bef829dcdaf0973168601e91b5478b5d827dbb967c9682b0eedd2a84211fb679e95d5b5e1a12d01ec5baef9b3b12995e376322fd81303c716 mkinitfs.sh"
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@ for hook in /etc/postmarketos-mkinitfs/hooks/*.sh; do
|
|||
sh "$hook"
|
||||
done
|
||||
|
||||
show_splash /splash-loading.ppm.gz
|
||||
|
||||
# Always run dhcp daemon/usb networking for now (later this should only
|
||||
# be enabled, when having the usb-shell hook installed for debugging,
|
||||
# or get activated after the initramfs is done with an OpenRC service).
|
||||
|
|
@ -26,10 +28,13 @@ start_udhcpd
|
|||
|
||||
mount_boot_partition
|
||||
extract_initramfs_extra @INITRAMFS_EXTRA@
|
||||
wait_root_partition
|
||||
resize_root_partition
|
||||
unlock_root_partition
|
||||
resize_root_filesystem
|
||||
mount_root_partition
|
||||
|
||||
# Switch root
|
||||
show_splash /splash-loading.ppm.gz
|
||||
killall telnetd mdev 2>/dev/null
|
||||
umount /boot
|
||||
umount /proc
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ mount_subpartitions() {
|
|||
for i in /dev/mmcblk*; do
|
||||
case "$(kpartx -l "$i" 2>/dev/null | wc -l)" in
|
||||
2)
|
||||
echo "mount subpartitions of $i"
|
||||
echo "Mount subpartitions of $i"
|
||||
kpartx -afs "$i"
|
||||
break
|
||||
;;
|
||||
|
|
@ -104,6 +104,7 @@ mount_boot_partition() {
|
|||
show_splash /splash-noboot.ppm.gz
|
||||
loop_forever
|
||||
fi
|
||||
echo "Mount boot partition ($partition)"
|
||||
mount -r -t ext2 "$partition" /boot
|
||||
}
|
||||
|
||||
|
|
@ -115,9 +116,74 @@ extract_initramfs_extra() {
|
|||
show_splash /splash-noinitramfsextra.ppm.gz
|
||||
loop_forever
|
||||
fi
|
||||
echo "Extract $initramfs_extra"
|
||||
gzip -d -c "$initramfs_extra" | cpio -i
|
||||
}
|
||||
|
||||
wait_root_partition() {
|
||||
while [ -z "$(find_root_partition)" ]; do
|
||||
show_splash /splash-nosystem.ppm.gz
|
||||
echo "Could not find the root partition."
|
||||
echo "Maybe you need to insert the sdcard, if your device has"
|
||||
echo "any? Trying again in one second..."
|
||||
sleep 1
|
||||
done
|
||||
}
|
||||
|
||||
resize_root_partition() {
|
||||
partition=$(find_root_partition)
|
||||
# Only resize the partition if it's inside the device-mapper, which means
|
||||
# that the partition is stored as a subpartition inside another one.
|
||||
# In this case we want to resize it to use all the unused space of the
|
||||
# external partition.
|
||||
if [ -z "${partition##"/dev/mapper/"*}" ]; then
|
||||
# Get physical device
|
||||
partition_dev=$(dmsetup deps -o devname "$partition" | \
|
||||
awk -F "[()]" '{print "/dev/"$2}')
|
||||
# Check if there is unallocated space at the end of the device
|
||||
if parted -s "$partition_dev" print free | tail -n2 | \
|
||||
head -n1 | grep -qi "free space"; then
|
||||
echo "Resize root partition ($partition)"
|
||||
# unmount subpartition, resize and remount it
|
||||
kpartx -d "$partition"
|
||||
parted -s "$partition_dev" resizepart 2 100%
|
||||
kpartx -afs "$partition_dev"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
unlock_root_partition() {
|
||||
partition="$(find_root_partition)"
|
||||
if cryptsetup isLuks "$partition"; then
|
||||
until cryptsetup status root | grep -qwi active; do
|
||||
start_usb_unlock
|
||||
cryptsetup luksOpen "$partition" root || continue
|
||||
done
|
||||
# Show again the loading splashscreen
|
||||
show_splash /splash-loading.ppm.gz
|
||||
fi
|
||||
}
|
||||
|
||||
resize_root_filesystem() {
|
||||
partition="$(find_root_partition)"
|
||||
touch /etc/mtab # see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=673323
|
||||
echo "Check/repair root filesystem ($partition)"
|
||||
e2fsck -f -y "$partition"
|
||||
echo "Resize root filesystem ($partition)"
|
||||
resize2fs -f "$partition"
|
||||
}
|
||||
|
||||
mount_root_partition() {
|
||||
partition="$(find_root_partition)"
|
||||
echo "Mount root partition ($partition)"
|
||||
mount -w -t ext4 "$partition" /sysroot
|
||||
if ! [ -e /sysroot/usr ]; then
|
||||
echo "ERROR: unable to mount root partition!"
|
||||
show_splash /splash-mounterror.ppm.gz
|
||||
loop_forever
|
||||
fi
|
||||
}
|
||||
|
||||
setup_usb_network_android() {
|
||||
# Only run, when we have the android usb driver
|
||||
SYS=/sys/class/android_usb/android0
|
||||
|
|
@ -156,7 +222,7 @@ setup_usb_network() {
|
|||
_marker="/tmp/_setup_usb_network"
|
||||
[ -e "$_marker" ] && return
|
||||
touch "$_marker"
|
||||
|
||||
echo "Setup usb network"
|
||||
# Run all usb network setup functions (add more below!)
|
||||
setup_usb_network_android
|
||||
setup_usb_network_configfs
|
||||
|
|
@ -182,7 +248,7 @@ start_udhcpd() {
|
|||
echo "option subnet 255.255.255.0"
|
||||
} >/etc/udhcpd.conf
|
||||
|
||||
# Start the dhcpcd daemon (forks into background)
|
||||
echo "Start the dhcpcd daemon (forks into background)"
|
||||
udhcpd
|
||||
}
|
||||
|
||||
|
|
@ -199,43 +265,19 @@ start_usb_unlock() {
|
|||
# Telnet splash
|
||||
show_splash /splash-telnet.ppm.gz
|
||||
|
||||
# Start the telnet daemon
|
||||
echo "Start the telnet daemon (unlock encrypted partition)"
|
||||
{
|
||||
echo '#!/bin/sh'
|
||||
echo '. /init_functions.sh'
|
||||
echo 'unlock_root_partition'
|
||||
echo 'echo_connect_ssh_message'
|
||||
echo 'killall cryptsetup telnetd'
|
||||
echo 'killall cryptsetup'
|
||||
echo "pkill -f telnetd.*:${TELNET_PORT}"
|
||||
} >/telnet_connect.sh
|
||||
chmod +x /telnet_connect.sh
|
||||
telnetd -b "${IP}:${TELNET_PORT}" -l /telnet_connect.sh
|
||||
}
|
||||
|
||||
unlock_root_partition() {
|
||||
# Wait for the root partition (and unlock it if it is encrypted)
|
||||
while ! [ -e /sysroot/usr ]; do
|
||||
partition="$(find_root_partition)"
|
||||
if [ -z "$partition" ]; then
|
||||
show_splash /splash-nosystem.ppm.gz
|
||||
echo "Could not find the root partition."
|
||||
echo "Maybe you need to insert the sdcard, if your device has"
|
||||
echo "any? Trying again in one second..."
|
||||
sleep 1
|
||||
elif cryptsetup isLuks "$partition"; then
|
||||
start_usb_unlock
|
||||
cryptsetup luksOpen "$partition" root || continue
|
||||
partition="/dev/mapper/root"
|
||||
break
|
||||
else
|
||||
# Unencrypted
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
# Mount the root partition
|
||||
[ -e /sysroot/usr ] || mount -w -t ext4 "$partition" /sysroot
|
||||
}
|
||||
|
||||
# $1: path to ppm.gz file
|
||||
show_splash() {
|
||||
gzip -c -d "$1" >/tmp/splash.ppm
|
||||
|
|
|
|||
|
|
@ -223,6 +223,10 @@ generate_splash_screens()
|
|||
pmos-make-splash --text="system partition not found\nhttps://postmarketos.org/troubleshooting" --center \
|
||||
--config /etc/postmarketos/splash.ini "$width" "$height" "${tmpdir}/splash-nosystem.ppm"
|
||||
gzip "${tmpdir}/splash-nosystem.ppm"
|
||||
|
||||
pmos-make-splash --text="unable to mount root partition\nhttps://postmarketos.org/troubleshooting" --center \
|
||||
--config /etc/postmarketos/splash.ini "$width" "$height" "${tmpdir}/splash-mounterror.ppm"
|
||||
gzip "${tmpdir}/splash-mounterror.ppm"
|
||||
}
|
||||
|
||||
# Append the correct device tree to the linux image file
|
||||
|
|
|
|||
Loading…
Reference in a new issue