X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver-setup.functions;h=236f2147d3c593b92ea809ea3d8a6d2d408f9ce1;hb=86a23427cca76a5a9befd60c85535a0e738bc3c6;hp=71a105f16e3863293885a539a5ffe17952d640db;hpb=c5774d5529e0481e9c7d324f6ac6a343180ca3fa;p=util-vserver.git diff --git a/util-vserver/scripts/vserver-setup.functions b/util-vserver/scripts/vserver-setup.functions index 71a105f..236f214 100644 --- a/util-vserver/scripts/vserver-setup.functions +++ b/util-vserver/scripts/vserver-setup.functions @@ -23,17 +23,20 @@ SETUP_NETBCAST= SETUP_LOCKFILE= SETUP_LOCKREVDIR= SETUP_CONFDIR= +SETUP_CONTEXT= 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:,context:" 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: $RUNDIR/rev/] + ... [default: $CONFDIR/.defaults/run.rev] --hostname --netdev --netbcast @@ -58,22 +61,23 @@ declare -r SETUP_HELPMSG=$" function setup_setOption2 { case "$1" in - --confdir) SETUP_CONFDIR=$2;; - --lockfile) SETUP_LOCKFILE=$2;; - --lockrevdir) SEUTP_LOCKREVDIR=$2;; - --hostname) SETUP_HOSTNAME=$2;; - --netdev) SETUP_NETDEV=$2;; - --netmask) SETUP_NETMASK=$2;; - --netprefix) SETUP_NETPREFIX=$2;; - --netbcast) SETUP_NETBCAST=$2;; - --interface) SETUP_INTERFACES=( "${SETUP_INTERFACES[@]}" "$2" );; - --flags) old_IFS=$IFS + (--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;; + (--netprefix) SETUP_NETPREFIX=$2;; + (--netbcast) SETUP_NETBCAST=$2;; + (--interface) SETUP_INTERFACES=( "${SETUP_INTERFACES[@]}" "$2" );; + (--flags) old_IFS=$IFS IFS=, set -- $2 SETUP_FLAGS=( "${SETUP_FLAGS[@]}" "$@" ) IFS=$old_IFS ;; - *) return 1;; + (*) return 1;; esac return 0 @@ -123,7 +127,8 @@ function setup_setDefaults { : ${SETUP_CONFDIR:=$CONFDIR/$1} : ${SETUP_LOCKFILE:=$RUNDIR/$1} - : ${SETUP_LOCKREVDIR:=$RUNDIR/rev} + : ${SETUP_LOCKREVDIR:=$CONFDIR/.defaults/run.rev} + findFile SETUP_FSTAB "$CONFDIR"/.defaults/fstab "$PKGLIBDEFAULTDIR"/fstab } function setup_writeOption @@ -135,6 +140,7 @@ function setup_writeOption mkdir -p "$cfgdir/interfaces" _setup_writeSingleOption "$name" "$cfgdir"/name + _setup_writeSingleOption "$SETUP_CONTEXT" "$cfgdir"/context _setup_writeSingleOption "$SETUP_HOSTNAME" "$cfgdir"/hostname _setup_writeSingleOption "$SETUP_NETDEV" "$cfgdir"/interfaces/dev _setup_writeSingleOption "$SETUP_NETMASK" "$cfgdir"/interfaces/mask @@ -157,11 +163,7 @@ function setup_writeOption function setup_writeInitialFstab { - cat <$SETUP_CONFDIR/fstab -none /proc proc defaults 0 0 -none /tmp tmpfs size=16m,mode=1777 0 0 -none /dev/pts devpts gid=5,mode=620 0 0 -EOF + cat "$SETUP_FSTAB" >"$SETUP_CONFDIR"/fstab } function setup_test