Changeset 698 for trunk/vblade-persist/src/vblade-persist

Timestamp:

Nov 11, 2007 2:05:30 PM (6 years ago)

Author:

dkg

Message:

vblade-persist: filled in the man page, cleaned up some bogus shell tests

File:

• trunk/vblade-persist/src/vblade-persist (modified) (6 diffs)

trunk/vblade-persist/src/vblade-persist

@@ -12 +12 @@
 
 usage() {
-    echo "usage: vblade-persist ls"
+    echo "usage: vblade-persist ls [--no-header]"
     echo "       vblade-persist start|stop|restart|auto|noauto SHELF SLOT"
     echo "       vblade-persist start|stop|restart|auto|noauto all"
     echo "       vblade-persist setup SHELF SLOT NETIF SOURCE"
     echo "       vblade-persist destroy SHELF SLOT"
-    echo "       vblade-persist mac SHELF SLOT"
+    echo "       vblade-persist mac SHELF SLOT ls"
     echo "       vblade-persist mac SHELF SLOT clear"
     echo "       vblade-persist mac SHELF SLOT add [MAC ...] "
@@ -126 +126 @@
 
 list() {
-    
-    echo -e '#shelf slot netif source auto stat'
+    [ "$1" = "--no-header" ] || echo -e '#shelf slot netif source auto stat'
     for dev in `ls "$VDIR"` ; do
          echo $(cat "$VDIR/$dev/env/SHELF" "$VDIR/$dev/env/SLOT" "$VDIR/$dev/env/NETIF" "$VDIR/$dev/env/SOURCE") $( [ -e "$VDIR/$dev/down" ] && echo 'no')auto $(cat "$VDIR/$dev/supervise/stat")
@@ -144 +143 @@
 auto() {
     verify_vblade_persist_path "$2" || fatal "'`basename $DPATH`' is not a vblade-persist-managed export"
-    if [ "$1" == "auto" ] ; then
+    if [ "$1" = "auto" ] ; then
         rm -f "$2/down"
     else
@@ -208 +207 @@
             done
             ;;
+        ls)
+            ls -1 "$DPATH/macs/"
+            ;;
         *)
-            ls -1 "$DPATH/macs/"
+            usage
+            exit 1;
             ;;
     esac
 
     # restart the vblade upon change
-    if [ "$CHANGES" == "yes" ] && [ `cat "$DPATH/supervise/stat"` == "run" ] ; then
+    if [ "$CHANGES" = "yes" ] && [ `cat "$DPATH/supervise/stat"` = "run" ] ; then
         sv restart "$DPATH"
     fi
@@ -226 +229 @@
         destroy "$2" "$3"
         ;;
-    l*)
-        list
+    ls)
+        list "$2"
         ;;
     start|stop|restart)
-        if [ "all" == "$2" ] ; then
+        if [ "all" = "$2" ] ; then
             svall "$1"
         else
@@ -239 +242 @@
         ;;
     auto|noauto)
-        if [ "all" == "$2" ] ; then
+        if [ "all" = "$2" ] ; then
             autoall "$1"
         else