use sendKillSequence instead of ctx-kill
[util-vserver.git] / util-vserver / scripts / vserver-setup.functions
index ebab93c..97c3a2a 100644 (file)
@@ -19,7 +19,7 @@ SETUP_HOSTNAME=
 SETUP_NETDEV=
 SETUP_NETMASK=
 SETUP_NETPREFIX=
-SETUP_BCAST=
+SETUP_NETBCAST=
 SETUP_LOCKFILE=
 SETUP_LOCKREVDIR=
 SETUP_CONFDIR=
@@ -27,15 +27,16 @@ SETUP_CONFDIR=
 declare -a SETUP_INTERFACES=()
 declare -a SETUP_FLAGS=()
 
-declare -r SETUP_OPTIONS="confdir:lockfile:lockrevdir:hostname:,netdev:,netmask:,netprefix:,netbcast:,interface:,flags:"
+declare -r SETUP_OPTIONS="confdir:,lockfile:,lockrevdir:,hostname:,netdev:,netmask:,netprefix:,netbcast:,interface:,flags:"
 declare -r SETUP_HELPMSG=$"
     --confdir   ...  [default: $CONFDIR/<name>]
     --lockfile <filename>
                ...  [default: $RUNDIR/<name>]
     --lockrevdir <dirname>
-               ...  [default: $RUNDIR/rev/]
+               ...  [default: $CONFDIR/.defaults/run.rev]
     --hostname <hostname>
     --netdev   <device>
+    --netbcast <broadcast>
     --netmask <netmask>|--netprefix <prefix>
                 ...  sets the  default netmask  (a.b.c.d quadruple)  or prefix
                     (length of the interface)
@@ -64,7 +65,7 @@ function setup_setOption2
        --netdev)       SETUP_NETDEV=$2;;
        --netmask)      SETUP_NETMASK=$2;;
        --netprefix)    SETUP_NETPREFIX=$2;;
-       --netbcast)     SETUP_BCAST=$2;;
+       --netbcast)     SETUP_NETBCAST=$2;;
        --interface)    SETUP_INTERFACES=( "${SETUP_INTERFACES[@]}" "$2" );;
        --flags)        old_IFS=$IFS
                        IFS=,
@@ -122,7 +123,7 @@ function setup_setDefaults
 {
     : ${SETUP_CONFDIR:=$CONFDIR/$1}
     : ${SETUP_LOCKFILE:=$RUNDIR/$1}
-    : ${SETUP_LOCKREVDIR:=$RUNDIR/rev}
+    : ${SETUP_LOCKREVDIR:=$CONFDIR/.defaults/run.rev}
 }
 
 function setup_writeOption
@@ -138,6 +139,7 @@ function setup_writeOption
     _setup_writeSingleOption "$SETUP_NETDEV"    "$cfgdir"/interfaces/dev
     _setup_writeSingleOption "$SETUP_NETMASK"   "$cfgdir"/interfaces/mask
     _setup_writeSingleOption "$SETUP_NETPREFIX" "$cfgdir"/interfaces/prefix
+    _setup_writeSingleOption "$SETUP_NETBCAST"  "$cfgdir"/interfaces/bcast
 
     local idx=0
     for i in "${SETUP_INTERFACES[@]}"; do