X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver-setup.functions;h=36f6ab473e7e7708b8e443f90809753541fa304b;hb=116c744b2f086b000adc8c6911a4cb4cae3dc8ca;hp=431c63874b4e609428e7d5bc2259468976dceda7;hpb=7bd540af89c36e0fc25d167f6c4893451b3331a3;p=util-vserver.git diff --git a/util-vserver/scripts/vserver-setup.functions b/util-vserver/scripts/vserver-setup.functions index 431c638..36f6ab4 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/] + --confdir ... [default: $__CONFDIR/] --lockfile - ... [default: $RUNDIR/] - --lockrevdir - ... [default: $CONFDIR/.defaults/run.rev] + ... [default: $__RUNDIR/] --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;; @@ -132,16 +129,15 @@ function _setup_writeInterface 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 + : ${SETUP_CONFDIR:=$__CONFDIR/$1} + : ${SETUP_LOCKFILE:=$__RUNDIR/$1} + findFile SETUP_FSTAB "$__CONFDIR"/.defaults/fstab "$__PKGLIBDEFAULTDIR"/fstab } function setup_writeOption { local name=$1 - local cfgdir=$SETUP_CONFDIR + local cfgdir=${SETUP_CONFDIR:?} local i mkdir -p "$cfgdir"/interfaces "$cfgdir"/apps/init "$cfgdir"/uts @@ -166,12 +162,11 @@ function setup_writeOption done >"$cfgdir"/flags ln -s "$SETUP_LOCKFILE" "$cfgdir"/run - ln -s "$SETUP_LOCKREVDIR" "$cfgdir"/run.rev } function setup_writeInitialFstab { - cat "$SETUP_FSTAB" >"$SETUP_CONFDIR"/fstab + cat "${SETUP_FSTAB:?}" >"${SETUP_CONFDIR:?}"/fstab } function setup_test