[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. fbb2ebd68446a51c4d6d543210a1f53b7fcd73dc

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. fbb2ebd68446a51c4d6d543210a1f53b7fcd73dc

[git]

[-- Attachment #1: Type: text/plain, Size: 2730 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  fbb2ebd68446a51c4d6d543210a1f53b7fcd73dc (commit)
      from  a6d0d790ebe2c72aa85b83961ab1915fec14ab20 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fbb2ebd68446a51c4d6d543210a1f53b7fcd73dc
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Fri Jan 20 21:06:45 2012 +0100

    flash-image: improve mount/dismount at partition resize.
    
    fix missing parameters at mount.
    remount / ro before reboot to leave a clean rootfs.

-----------------------------------------------------------------------

Summary of changes:
 src/initscripts/init.d/fsresize   |    9 +++++----
 src/initscripts/init.d/partresize |    7 +++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

Difference in files:
diff --git a/src/initscripts/init.d/fsresize b/src/initscripts/init.d/fsresize
index b1af720..0afe779 100644
--- a/src/initscripts/init.d/fsresize
+++ b/src/initscripts/init.d/fsresize
@@ -17,11 +17,11 @@
 
 case "${1}" in
 	start)
-		boot_mesg "Autoresize /var partition to use the whole drive ..."
-
-		# Ensure that / is writeable
-		mount
+		boot_mesg "Mounting root file system in read/write mode ..."
+		mount -o remount,rw / > /dev/null
+		evaluate_retval
 
+		boot_mesg "Autoresize /var partition to use the whole drive ..."
 		# Detect device
 		ROOT=`mount | grep -m1 " / " | cut -d" " -f1`;
 		DRV=${ROOT::`expr length $ROOT`-1}
@@ -34,6 +34,7 @@ case "${1}" in
 
 		# Erase symlink, it should run only once
 		rm -f /etc/rc.d/rcsysinit.d/S26fsresize
+		sync
 
 		exit 0;
 		;;
diff --git a/src/initscripts/init.d/partresize b/src/initscripts/init.d/partresize
index 9c9a609..8eddc46 100644
--- a/src/initscripts/init.d/partresize
+++ b/src/initscripts/init.d/partresize
@@ -18,8 +18,9 @@
 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`;
@@ -32,6 +33,8 @@ case "${1}" in
 		rm -f /etc/rc.d/rcsysinit.d/S25partresize
 
 		boot_mesg "Rebooting ..."
+		sync
+		mount -o remount,ro / > /dev/null
 		reboot -f
 
 		;;


hooks/post-receive
--
IPFire 2.x development tree