Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 11 Feb 2014 11:00:40 +0000 (12:00 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 11 Feb 2014 11:00:40 +0000 (12:00 +0100)
src/initscripts/init.d/partresize

index 474b79f4dd23ac254b8697d4dd6ca4fce0660cc3..caa4ab88d07943db2b19e074574168296500003f 100644 (file)
@@ -36,12 +36,11 @@ case "${1}" in
                        DRV=${ROOT::`expr length $ROOT`-1}
                fi
 
-               boot_mesg "Update c,h,s values of ${DRV} ..."
-               echo -e ',' | sfdisk --no-reread -f -N1 ${DRV} 2>&1 > /dev/null
-               echo -e ',' | sfdisk --no-reread -f -N3 ${DRV} 2>&1 > /dev/null
-
                boot_mesg "Change Partition ${DRV}3 to all free space ..."
-               echo -e ',+' | sfdisk --no-reread -N3 ${DRV} 2>/dev/null
+               echo -e ',+' | sfdisk --no-reread -f -N3 ${DRV} 2>/dev/null
+
+               boot_mesg "Update c,h,s values of ${DRV}1 ..."
+               echo -e ',' | sfdisk --no-reread -f -N1 ${DRV} 2>&1 > /dev/null
 
                # Erase symlink, it should run only once
                rm -f /etc/rc.d/rcsysinit.d/S25partresize