[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (c06621ece226013f9c92798903387037bcb96fd2)

Vlad Glagolev scm at sourcemage.org
Fri Jun 10 17:35:33 EDT 2011


GIT changes to master grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 smgl/init.d/DETAILS        |    2 +-
 smgl/init.d/HISTORY        |    6 ++++++
 smgl/init.d/init.d/devices |    2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit c06621ece226013f9c92798903387037bcb96fd2
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    init.d: corrected devtmpfs detection

diff --git a/smgl/init.d/DETAILS b/smgl/init.d/DETAILS
index d8e1abf..2b6a208 100755
--- a/smgl/init.d/DETAILS
+++ b/smgl/init.d/DETAILS
@@ -1,5 +1,5 @@
            SPELL=init.d
-         VERSION=2.2.11
+         VERSION=2.2.12
       LICENSE[0]=GPL
      GATHER_DOCS=off
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/smgl/init.d/HISTORY b/smgl/init.d/HISTORY
index c1a5997..54f1da1 100644
--- a/smgl/init.d/HISTORY
+++ b/smgl/init.d/HISTORY
@@ -1,3 +1,9 @@
+2011-06-11 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: 2.2.12
+	* init.d/devices: grep shouldn't be used on such low-level stage, cause
+	  on multi-partition setup (when /usr is separated from /) it becomes
+	  unaccessible -- so use /bin/findmnt from util-linux
+
 2011-05-31 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.2.11
 	* PRE_BUILD: check for CONFIG_DEVTMPFS_MOUNT removed
diff --git a/smgl/init.d/init.d/devices b/smgl/init.d/init.d/devices
index b7c3484..dde9a1b 100755
--- a/smgl/init.d/init.d/devices
+++ b/smgl/init.d/init.d/devices
@@ -42,7 +42,7 @@ start_udev()
 { (
   . /etc/udev/udev.conf
   echo "Checking if devtmpfs or ramfs is used for $udev_root ..."
-  if grep devtmpfs /proc/mounts; then
+  if findmnt devtmpfs > /dev/null 2>&1; then
     echo "devtmpfs is used for $udev_root"
   else
     echo "ramfs is used for $udev_root"


More information about the SM-Commit mailing list