added (untested) support for '/' in the vserver fstab
[util-vserver.git] / util-vserver / scripts / vserver-setup.functions
index 8a936ca..2a3241d 100644 (file)
@@ -24,11 +24,12 @@ SETUP_LOCKFILE=
 SETUP_LOCKREVDIR=
 SETUP_CONFDIR=
 SETUP_CONTEXT=
+SETUP_INITSTYLE=
 
 declare -a SETUP_INTERFACES=()
 declare -a SETUP_FLAGS=()
 
-declare -r SETUP_OPTIONS="confdir:,lockfile:,lockrevdir:,hostname:,netdev:,netmask:,netprefix:,netbcast:,interface:,flags:,context:"
+declare -r SETUP_OPTIONS="confdir:,lockfile:,lockrevdir:,hostname:,netdev:,netmask:,netprefix:,netbcast:,interface:,flags:,context:,initstyle:"
 declare -r SETUP_HELPMSG=$"
     --context   ...  the static context of the vserver [default: none; a dynamic
                      context will be assumed]
@@ -40,10 +41,10 @@ declare -r SETUP_HELPMSG=$"
     --hostname <hostname>
     --netdev   <device>
     --netbcast <broadcast>
-    --netmask <netmask>|--netprefix <prefix>
-                ...  sets the  default netmask  (a.b.c.d quadruple)  or prefix
+    --netmask <netmask>|--netprefix <prefixlen>
+                ...  sets the  default netmask  (a.b.c.d quadruple)  or prefixlen
                     (length of the interface)
-    --interface [<name-suffix>=][<device>:]<ip>[/<mask|prefix>]
+    --interface [<name-suffix>=][<device>:]<ip>[/<mask|prefixlen>]
                 ...  declares an network-interface;  this option can be specified
                     multiple times
     --flags <flags>+
@@ -56,6 +57,8 @@ declare -r SETUP_HELPMSG=$"
                            this becomes a per vserver limit)
                     private: No other process can join this security context.
                            Even root
+    --initstyle <style>
+                ...  configures the initstyle (e.g. minit,sysv,plain)
 "
 
 function setup_setOption2
@@ -71,6 +74,7 @@ function setup_setOption2
        (--netprefix)   SETUP_NETPREFIX=$2;;
        (--netbcast)    SETUP_NETBCAST=$2;;
        (--interface)   SETUP_INTERFACES=( "${SETUP_INTERFACES[@]}" "$2" );;
+       (--initstyle)   SETUP_INITSTYLE=$2;;
        (--flags)       old_IFS=$IFS
                        IFS=,
                        set -- $2
@@ -121,6 +125,9 @@ function _setup_writeInterface
     _setup_writeSingleOption "$ip"     $d/ip
     _setup_writeSingleOption "$mask"   $d/mask
     _setup_writeSingleOption "$prefix" $d/prefix
+
+    test "$dev" -o "$SETUP_NETDEV" || \
+       echo $"No device specified for interface '$idx'; do not forget to set the 'nodev' option" >&2
 }
 
 function setup_setDefaults
@@ -128,7 +135,7 @@ function setup_setDefaults
     : ${SETUP_CONFDIR:=$CONFDIR/$1}
     : ${SETUP_LOCKFILE:=$RUNDIR/$1}
     : ${SETUP_LOCKREVDIR:=$CONFDIR/.defaults/run.rev}
-    findFile SETUP_FSTAB "$CONFDIR"/.defaults/fstab "$PKGLIBDIR"/defaults/fstab
+    findFile SETUP_FSTAB "$CONFDIR"/.defaults/fstab "$PKGLIBDEFAULTDIR"/fstab
 }
 
 function setup_writeOption
@@ -137,15 +144,16 @@ function setup_writeOption
     local cfgdir=$SETUP_CONFDIR
     local i
 
-    mkdir -p "$cfgdir/interfaces"
+    mkdir -p "$cfgdir"/interfaces "$cfgdir"/apps/init "$cfgdir"/uts
 
     _setup_writeSingleOption "$name"            "$cfgdir"/name
     _setup_writeSingleOption "$SETUP_CONTEXT"   "$cfgdir"/context
-    _setup_writeSingleOption "$SETUP_HOSTNAME"  "$cfgdir"/hostname
+    _setup_writeSingleOption "$SETUP_HOSTNAME"  "$cfgdir"/uts/nodename
     _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
+    _setup_writeSingleOption "$SETUP_INITSTYLE" "$cfgdir"/apps/init/style
 
     local idx=0
     for i in "${SETUP_INTERFACES[@]}"; do
@@ -157,8 +165,8 @@ function setup_writeOption
        echo "$i"
     done >"$cfgdir"/flags
 
-    ln -s "$SETUP_LOCKFILE"   "$cfgdir/run"
-    ln -s "$SETUP_LOCKREVDIR" "$cfgdir/run.rev"
+    ln -s "$SETUP_LOCKFILE"   "$cfgdir"/run
+    ln -s "$SETUP_LOCKREVDIR" "$cfgdir"/run.rev
 }
 
 function setup_writeInitialFstab