Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

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

 libs/libcgroup/DETAILS         |    2 ++
 libs/libcgroup/HISTORY         |    7 +++++++
 libs/libcgroup/init.d/cgconfig |    6 +++---
 libs/libcgroup/init.d/cgred    |    2 +-
 utils/dockerio/DETAILS         |    1 +
 utils/dockerio/HISTORY         |    4 ++++
 utils/dockerio/init.d/docker   |    2 +-
 7 files changed, 19 insertions(+), 5 deletions(-)

New commits:
commit c3f46012cc9e5088f39bfa6409361c9290347e33
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    libcgroup: additional check for running services/mounted subsystems

commit 5fa8a6aba0806c1639d6fa3e9693818ecce46454
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    libcgroup: don't do useless doc'ing

commit 0d5258e94c7ef9f1b1a8244419fe59958474c8ce
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    docker: deprecated '-d' flag for the init script

commit e0f546280699b8be1f23f849d6b8162db983aac6
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    libcgroup: fixed cgclear issue in the init script

diff --git a/libs/libcgroup/DETAILS b/libs/libcgroup/DETAILS
index a818b4a..1ae8f01 100755
--- a/libs/libcgroup/DETAILS
+++ b/libs/libcgroup/DETAILS
@@ -1,9 +1,11 @@
            SPELL=libcgroup
          VERSION=0.41
+      PATCHLEVEL=1
           SOURCE=$SPELL-$VERSION.tar.bz2
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    
SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/libcg/$SPELL/v$VERSION/$SOURCE
+        DOC_DIRS=""
         WEB_SITE=http://libcg.sourceforge.net/
       LICENSE[0]=GPL
          ENTERED=20100805
diff --git a/libs/libcgroup/HISTORY b/libs/libcgroup/HISTORY
index 6a5f06f..eb31c73 100644
--- a/libs/libcgroup/HISTORY
+++ b/libs/libcgroup/HISTORY
@@ -1,3 +1,10 @@
+2015-09-30 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: PATCHLEVEL=1; don't do useless doc'ing
+       * init.d/cgconfig: cgclear makes no sense without providing the 
config;
+         dumb lockfile is not enough to check for a mounted subsystem
+       * init.d/cgred: dumb lockfile is not enough to check for a running
+         service
+
 2015-05-26 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 0.41
        * INSTALL: Install sample configuration file
diff --git a/libs/libcgroup/init.d/cgconfig b/libs/libcgroup/init.d/cgconfig
index b0dccb1..67e7a38 100644
--- a/libs/libcgroup/init.d/cgconfig
+++ b/libs/libcgroup/init.d/cgconfig
@@ -94,8 +94,8 @@ create_default_groups() {
 
 start() {
        echo -n "Starting cgconfig service: "
-       if [ -f "$lockfile" ]; then
-               print_status warning "lock file already exists"
+       if [ -f "$lockfile" ] && lscgroup > /dev/null 2>&1; then
+               print_status warning "cgroups are already mounted"
                return 0
        fi  &&
 
@@ -116,7 +116,7 @@ start() {
 
 stop() {
        echo -n "Stopping cgconfig service: "
-       cgclear
+       cgclear -l $CONFIG_FILE
        rm -f "$lockfile"
        evaluate_retval
 }
diff --git a/libs/libcgroup/init.d/cgred b/libs/libcgroup/init.d/cgred
index f77ec1d..6b7cb9a 100644
--- a/libs/libcgroup/init.d/cgred
+++ b/libs/libcgroup/init.d/cgred
@@ -66,7 +66,7 @@ fi
 start()
 {
        echo -n $"Starting CGroup Rules Engine Daemon: "
-       if [ -f "$lockfile" ]; then
+       if [ -f "$lockfile" ] && pgrep "cgrulesengd" > /dev/null; then
                print_status failure "${servicename} is already running with 
PID `cat ${pidfile}`"
                return 0
        fi
diff --git a/utils/dockerio/DETAILS b/utils/dockerio/DETAILS
index e98aade..40939cb 100755
--- a/utils/dockerio/DETAILS
+++ b/utils/dockerio/DETAILS
@@ -1,6 +1,7 @@
            SPELL=dockerio
           SPELLX=${SPELL/io/}
          VERSION=1.8.2
+      PATCHLEVEL=1
 DOCKER_GITCOMMIT='0a8c2e3' # Because Docker building is dumb
           SOURCE="${SPELLX}-${VERSION}.tar.gz"
    
SOURCE_URL[0]="http://github.com/${SPELLX}/${SPELLX}/archive/v${VERSION}.tar.gz";
diff --git a/utils/dockerio/HISTORY b/utils/dockerio/HISTORY
index 0b4b0b8..d21d6ce 100644
--- a/utils/dockerio/HISTORY
+++ b/utils/dockerio/HISTORY
@@ -1,3 +1,7 @@
+2015-09-30 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: PATCHLEVEL=1
+       * init.d/docker: '-d' is deprecated, use 'daemon' instead
+
 2015-09-29 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 1.8.2; use SPELLX
        * PRE_BUILD: moved to PREPARE
diff --git a/utils/dockerio/init.d/docker b/utils/dockerio/init.d/docker
index 51381bd..3c2336e 100755
--- a/utils/dockerio/init.d/docker
+++ b/utils/dockerio/init.d/docker
@@ -38,7 +38,7 @@ start() {
         prestart
         printf "Starting ${servicename}:\t"
         echo "\n$(date)\n" >> ${LOGFILE}
-        "${UNSHARE}" -m -- ${PROGRAM} -d ${SYSCONF_ARGS} &>> ${LOGFILE} &
+        "${UNSHARE}" -m -- ${PROGRAM} daemon ${SYSCONF_ARGS} &>> ${LOGFILE} &
         pid=$!
         touch ${LOCKFILE}
         # wait up to 10 seconds for the PIDFILE to exist.  see