Merge remote-tracking branch 'stevee/mc-update' into thirteen

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

diff --git a/src/initscripts/init.d/partresize b/src/initscripts/init.d/partresize
index 9c9a60998d4636bb17541fe2bf00f85b528a4184..33b56266a403289b181ed8ede518a5c372c94afb 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.01
 #
 # Notes       :
 #
@@ -18,20 +18,27 @@
 case "${1}" in
        start)
 
-               # Ensure that / is writeable
-               mount -o remount,rw /
+               boot_mesg "Mounting root file system in read/write mode ..."
+               mount -o remount,rw / > /dev/null
+               evaluate_retval
 
                # Detect device
                ROOT=`mount | grep -m1 " / " | cut -d" " -f1`;
-               DRV=${ROOT::`expr length $ROOT`-1}
+               if [ "${ROOT:`expr length $ROOT`-2:1}" == "p" ]; then
+                       DRV=${ROOT::`expr length $ROOT`-2}
+               else
+                       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 'd\n3\nn\np\n3\n\n\nw\nq\n' | fdisk ${DRV}
 
                # Erase symlink, it should run only once
                rm -f /etc/rc.d/rcsysinit.d/S25partresize
 
                boot_mesg "Rebooting ..."
+               sync
+               mount -o remount,ro / > /dev/null
                reboot -f
 
                ;;