Changeset 694

Timestamp:

Nov 11, 2007 3:46:00 AM (6 years ago)

Author:

dkg

Message:

vblade-persist: change all instances of INTERFACE to NETIF for consistency.

Location:

trunk/vblade-persist/src

Files:

• vblade-persist (modified) (5 diffs)
• vblade-persist.8 (modified) (1 diff)
• vblade-run (modified) (1 diff)

trunk/vblade-persist/src/vblade-persist

@@ -69 +69 @@
     SHELF="$1"
     SLOT="$2"
-    INTERFACE="$3"
+    NETIF="$3"
     SOURCE="$4"
 
     verify_shelf "$SHELF" || fatal "not a valid shelf: '$SHELF'"
     verify_slot "$SLOT" || fatal "not a valid shelf: '$SLOT'"
-    verify_interface "$INTERFACE" || fatal "not a valid interface: '$INTERFACE'"
+    verify_interface "$NETIF" || fatal "not a valid interface: '$NETIF'"
     verify_source "$SOURCE" || fatal "not a valid source: '$SOURCE'"
 
@@ -93 +93 @@
     echo "$SHELF" > "$VDIR/$DNAME/env/SHELF"
     echo "$SLOT" > "$VDIR/$DNAME/env/SLOT"
-    echo "$INTERFACE" > "$VDIR/$DNAME/env/INTERFACE"
+    echo "$NETIF" > "$VDIR/$DNAME/env/NETIF"
     echo "$SOURCE" > "$VDIR/$DNAME/env/SOURCE"
 
@@ -105 +105 @@
     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/INTERFACE" "$VDIR/$dev/env/SOURCE") $( [ -e "$VDIR/$dev/down" ] && echo 'no')auto $(cat "$VDIR/$dev/supervise/stat")
+         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")
     done
 }
@@ -153 +153 @@
             svall "$1"
         else
-            verify_shelf "$2" || fatal "Not a valid shelf: $2"
-            verify_slot "$3" || fatal "Not a valid slot: $3"
+            verify_shelf "$2" || fatal "Not a valid shelf: '$2'"
+            verify_slot "$3" || fatal "Not a valid slot: '$3'"
             svcommand "$1" "$VDIR/e$2.$3"
         fi
@@ -162 +162 @@
             autoall "$1"
         else
-            verify_shelf "$2" || fatal "Not a valid shelf: $2"
-            verify_slot "$3" || fatal "Not a valid slot: $3"
+            verify_shelf "$2" || fatal "Not a valid shelf: '$2'"
+            verify_slot "$3" || fatal "Not a valid slot: '$3'"
             auto "$1" "$VDIR/e$2.$3"
         fi

trunk/vblade-persist/src/vblade-persist.8

@@ -4 +4 @@
 .SH SYNOPSIS
 .nf
-.B vblade-persist setup shelf slot netif filename
+.B vblade-persist setup <shelf> <slot> <netif> <blockdev>
 .B vblade-persist restart all
 .fi

trunk/vblade-persist/src/vblade-run

@@ -21 +21 @@
  mkdir -p /dev/etherd;
  ln -s "$SOURCE" "/dev/etherd/e$SHELF.$SLOT" && \
- exec vblade '"$MACLIMITS"' "$SHELF" "$SLOT" "$INTERFACE" "$SOURCE"
+ exec vblade '"$MACLIMITS"' "$SHELF" "$SLOT" "$NETIF" "$SOURCE"
 '