X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver-setup.functions;h=0dc0634f922a587e940ebb824596d02c1061375d;hb=bb95a260f18983e80abcad495bd224b386a705e1;hp=9187460edb4b5c3a59a23bec29fb8be221b40f22;hpb=e92db4ce3c98de3542281926fde4627da894857d;p=util-vserver.git diff --git a/util-vserver/scripts/vserver-setup.functions b/util-vserver/scripts/vserver-setup.functions index 9187460..0dc0634 100644 --- a/util-vserver/scripts/vserver-setup.functions +++ b/util-vserver/scripts/vserver-setup.functions @@ -21,7 +21,6 @@ SETUP_NETMASK= SETUP_NETPREFIX= SETUP_NETBCAST= SETUP_LOCKFILE= -SETUP_LOCKREVDIR= SETUP_CONFDIR= SETUP_CONTEXT= SETUP_INITSTYLE= @@ -29,15 +28,13 @@ 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:,initstyle:" +declare -r SETUP_OPTIONS="confdir:,lockfile:,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] --confdir ... [default: $CONFDIR/] --lockfile ... [default: $RUNDIR/] - --lockrevdir - ... [default: $CONFDIR/.defaults/run.rev] --hostname --netdev --netbcast @@ -51,7 +48,8 @@ declare -r SETUP_HELPMSG=$" ... sets comma-separated list of flags; possible flags are lock: Prevent the vserver from setting new security context sched: Merge scheduler priority of all processes in the - vserver so that it acts a like a single one. + vserver so that it acts a like a single + one (kernel 2.4 only). nproc: Limit the number of processes in the vserver according to ulimit (instead of a per user limit, this becomes a per vserver limit) @@ -67,7 +65,6 @@ function setup_setOption2 (--context) SETUP_CONTEXT=$2;; (--confdir) SETUP_CONFDIR=$2;; (--lockfile) SETUP_LOCKFILE=$2;; - (--lockrevdir) SEUTP_LOCKREVDIR=$2;; (--hostname) SETUP_HOSTNAME=$2;; (--netdev) SETUP_NETDEV=$2;; (--netmask) SETUP_NETMASK=$2;; @@ -125,13 +122,15 @@ function _setup_writeInterface _setup_writeSingleOption "$ip" $d/ip _setup_writeSingleOption "$mask" $d/mask _setup_writeSingleOption "$prefix" $d/prefix + + test -n "$dev" -o -n "$SETUP_NETDEV" || \ + echo $"No device specified for interface '$idx'; do not forget to set the 'nodev' option" >&2 } function setup_setDefaults { : ${SETUP_CONFDIR:=$CONFDIR/$1} : ${SETUP_LOCKFILE:=$RUNDIR/$1} - : ${SETUP_LOCKREVDIR:=$CONFDIR/.defaults/run.rev} findFile SETUP_FSTAB "$CONFDIR"/.defaults/fstab "$PKGLIBDEFAULTDIR"/fstab } @@ -163,7 +162,6 @@ function setup_writeOption done >"$cfgdir"/flags ln -s "$SETUP_LOCKFILE" "$cfgdir"/run - ln -s "$SETUP_LOCKREVDIR" "$cfgdir"/run.rev } function setup_writeInitialFstab