From c0504c5cc5ddf46d9eb672b954fdc93274c2162c Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 5 Nov 2014 14:27:59 +0100 Subject: [PATCH] part/fsresize: fix on systems without initrd. /proc/mounts has no correct entry for / on such systems. Use mount instead. --- src/initscripts/init.d/fsresize | 4 ++-- src/initscripts/init.d/partresize | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/initscripts/init.d/fsresize b/src/initscripts/init.d/fsresize index 325c731af8..79aeb36fc7 100644 --- a/src/initscripts/init.d/fsresize +++ b/src/initscripts/init.d/fsresize @@ -21,7 +21,7 @@ case "${1}" in boot_mesg "Re-sizing root partition..." # Find root device - while read -r dev mountpoint fs options; do + mount | while read -r dev tmp1 mountpoint tmp2; do # Skip generic entries [ "${dev}" = "rootfs" ] && continue @@ -33,7 +33,7 @@ case "${1}" in rm -f /.resizefs break fi - done < /proc/mounts + done fi ;; diff --git a/src/initscripts/init.d/partresize b/src/initscripts/init.d/partresize index 38c5683166..8c05f4d15e 100644 --- a/src/initscripts/init.d/partresize +++ b/src/initscripts/init.d/partresize @@ -22,8 +22,14 @@ case "${1}" in mount -o remount,rw / > /dev/null evaluate_retval + boot_mesg "Create /etc/mtab..." + > /etc/mtab + mount -f / || failed=1 + (exit ${failed}) + evaluate_retval + # Detect device - while read -r dev mountpoint fs options; do + mount | while read -r dev tmp1 mountpoint tmp2; do [ "${dev}" = "rootfs" ] && continue if [ "${mountpoint}" = "/" ]; then @@ -57,7 +63,7 @@ case "${1}" in sleep 15 reboot -f fi - done < /proc/mounts + done fi ;; *) -- 2.39.2