[SM-Commit] GIT changes to master grimoire by David Haley (975e9a485b3c7c634a1829c833e61d61fe4be4ce)

David Haley scm at sourcemage.org
Tue Aug 31 20:47:48 EDT 2010


GIT changes to master grimoire by David Haley <khoralin at gmail.com>:

 http/firefox/DEPENDS           |    4 ++--
 http/firefox/HISTORY           |    3 ---
 smgl/init.d/HISTORY            |    3 +++
 smgl/init.d/init.d/mountall.sh |    7 ++++---
 4 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit 975e9a485b3c7c634a1829c833e61d61fe4be4ce
Author: David Haley <khoralin at gmail.com>
Commit: David Haley <khoralin at gmail.com>

    init.d/mountall.sh: checkfs() fixed to properly remove /fastboot.
    
    There was an issue in quick /fastboot would not be removed during teh
    checkfs() call. The function would return before teh appropriate 'rm'
    command was called. In short, if someone placed /fastboot the filesystems
    no longer be checked, ever, unless the /fastboot was manually removed
    at some point down the road.
    
    This has been corrected. IF logic has been updated to ensure that
    /fastboot is removed before the function returns.
    
    This has been tested locally and seems to be working as expeted.

commit cf023f25b519178d42bab651878c58595870b85b
Author: David Haley <khoralin at gmail.com>
Commit: David Haley <khoralin at gmail.com>

    Revert "firefox: xulrunner dependent regardless of CVS status."
    
    This reverts commit 027f5baf2881442e5c1fc5859947eb0e0464508f.

diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index 3c31975..249e60b 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -10,11 +10,11 @@ depends  zlib                              &&
 depends  cairo                             &&
 depends  python                            &&
 depends  libnotify                         &&
-depends  xulrunner                         &&
 if [[ "$FIREFOX_CVS" = "n" ]]; then 
 depends  nspr                              &&
 depends  -sub "3.12.x" nss                 &&
-depends -sub APNG libpng
+depends -sub APNG libpng                   &&
+depends  xulrunner
 else
 depends autoconf-2.13                      &&
 depends libnotify                          &&
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 04cce1e..dba8f8e 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,6 +1,3 @@
-2010-08-30 David C. Haley <khoralin at gmail.com>
-	* DEPENDS: xulrunner not dependent on CVS status.
-
 2010-08-28 George Sherwood <gsherwood at sourcemage.org>
 	* DETAILS: Updated devel to version 4.0b4
 	* DEPENDS: Optional depends on yasm
diff --git a/smgl/init.d/HISTORY b/smgl/init.d/HISTORY
index be0471b..d20c78d 100644
--- a/smgl/init.d/HISTORY
+++ b/smgl/init.d/HISTORY
@@ -1,3 +1,6 @@
+2010-08-31 David C. Haley <khoralin at gmail.com>
+	* init.d/mountall.sh: checkfs() fixed removal of /fastboot
+
 2009-09-08 Arjan Bouter <abouter at sourcemage.org>
 	* PROVIDES: added, provide INITSCRIPTS
 
diff --git a/smgl/init.d/init.d/mountall.sh b/smgl/init.d/init.d/mountall.sh
index 4107f29..f0ddf5e 100755
--- a/smgl/init.d/init.d/mountall.sh
+++ b/smgl/init.d/init.d/mountall.sh
@@ -26,7 +26,10 @@ function recursive_rm() {
 
 checkfs()
 {
-  [ -e /fastboot     ]  &&  return
+  if [ -e /fastboot ]; then
+    rm -f /fastboot;
+    return;
+  fi
   [ -e /forcefsck    ]  &&  FORCE="-f"
   [ "$NOSOFTFIX" != yes ]  &&  FIX="-a"
   [ "$FSCKFIX" = yes ]  &&  FIX="-y"
@@ -47,8 +50,6 @@ checkfs()
     /sbin/sulogin
     /sbin/reboot  -f
   fi
-
-  rm -f /fastboot /forcefsck
 }
 
 scanlvm()



More information about the SM-Commit mailing list