Changeset 348

Timestamp:

06/23/2009 18:15:20 (3 years ago)

Author:

blee

Message:

Merge confaudit changes from trunk.

Fixes #36, #37, #38

Location:

branches/confman-1.9

Files:

• . (modified) (1 prop)
• abspath.in (modified) (1 prop)
• confaudit.in (modified) (3 diffs)
• conflock.in (modified) (1 prop)
• confmanlib.sh.in (modified) (1 prop)

branches/confman-1.9/confaudit.in

@@ -35 +35 @@
 
 function print_help {
-    echo "usage: $0 [-q]" >&4
+    echo "usage: $0 [-d] [-q]" >&4
     exit ${1:-0}
 }
@@ -42 +42 @@
 while getopts "qh" opt 2>&4 ; do
     case $opt in 
+        d) DEBUG=true ;;
         q) quiet=true ;;
         h) print_help 0 ;;
@@ -48 +49 @@
 done
 
+trap "conf_cleanExit" EXIT
+# If we're in debug mode, we should log stderr messages to the logger
+# as well. Otherwise, we send them to the bit bucket.
+if $DEBUG ; then
+    exec 1>&2
+else
+    exec 1>/dev/null
+fi
+
 conf_lock_system
+
+# Set up our "Working Copy"
 tarball=$(conf_fetch)
-if ! [ -s $tarball ] 
-then
+if ! [ -s $tarball ] ; then
     echo "Could not fetch the tarball." >&2
     exit 1
 fi
 
-export WORK_PATH=$(conf_tmp_dir)
-export LIVE_ROOT=$(conf_tmp_dir)
+WORK_PATH=$(conf_tmp_dir)
+LIVE_ROOT=$(conf_tmp_dir)
 
 tar -xzf $tarball -C $WORK_PATH
 rm -rf $tarball
 
+echo "Audit operation started" | conf_logger
 for layer in $(conf_get_recipe) ; do
     echo "Rolling on $layer..."
-    conf_rollout $layer || return $?
+    conf_rollout $layer || conf_cleanExit
 done
 for file in $SINGULARITIES ; do
-    conf_assemble_sing $file || return $?
+    echo "Assembling singularity $file..."
+    conf_assemble_sing $file || conf_cleanExit
 done
+rm -rf $WORK_PATH
 
-rm -rf $WORK_PATH
-if $quiet
-then
-    $SUDO /usr/bin/diff -rPu / $LIVE_ROOT | grep -v "^Only in"
+if $quiet; then
+    diff -ruq / $LIVE_ROOT | grep -v "^Only in" >&2
 else
-    $SUDO /usr/bin/diff -rPuq / $LIVE_ROOT | grep -v "^Only in"
+    diff -ru / $LIVE_ROOT | grep -v "^Only in" >&2
 fi
+echo "Audit operation finished successfully" | conf_logger
 
 conf_unlock_system
-$SUDO rm -rf $LIVE_ROOT
 
+trap EXIT
+rm -rf $LIVE_ROOT
+