partresize: fix partresize for new arm image layout.

[people/teissler/ipfire-2.x.git] / src / initscripts / init.d / partresize

diff --git a/src/initscripts/init.d/partresize b/src/initscripts/init.d/partresize
index ae70ff99b85f153e055f2079a6f7acc3009dc8c9..909d63f669ebfcc32ae4549db122c636bebaa8f0 100644 (file)
--- a/src/initscripts/init.d/partresize
+++ b/src/initscripts/init.d/partresize
@@ -2,11 +2,11 @@
 ########################################################################
 # Begin $rc_base/init.d/partresize
 #
-# Description : Resize the /var partition to the drivesize
+# Description : Resize the root partition to the drivesize
 #
 # Authors     : Arne Fitzenreiter - arne_f@ipfire.org
 #
-# Version     : 1.00
+# Version     : 1.03
 #
 # Notes       :
 #
@@ -22,6 +22,12 @@ 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
                ROOT=`mount | grep -m1 " / " | cut -d" " -f1`;
                if [ "${ROOT:`expr length $ROOT`-2:1}" == "p" ]; then
@@ -30,8 +36,8 @@ case "${1}" in
                        DRV=${ROOT::`expr length $ROOT`-1}
                fi
 
-               boot_mesg "Change Partition 4 to all free space ..."
-               echo -e 'd\n4\nn\np\n4\n\n\nw\nq\n' | fdisk ${DRV}
+               boot_mesg "Change Partition ${DRV}3 to all free space ..."
+               echo -e ',+' | sfdisk --no-reread -N3 ${DRV} 2>/dev/null
 
                # Erase symlink, it should run only once
                rm -f /etc/rc.d/rcsysinit.d/S25partresize
@@ -49,4 +55,3 @@ case "${1}" in
 esac
 
 # End $rc_base/init.d/partresize
-