projects / packages / util-vserver.git / blame
| Commit | Line | Data |
|---|---|---|
| 9e40d78c ER |
1 | --- util-vserver-0.30.214/scripts/vserver-setup.functions 2007-09-02 23:06:41.000000000 +0300 |
| 2 | +++ util-vserver-0.30.214/scripts/vserver-setup.functions 2008-03-25 20:16:25.000000000 +0200 | |
| 3 | @@ -28,11 +28,13 @@ | |
| 4 | SETUP_CPUSETCPUS= | |
| 5 | SETUP_CPUSETMEMS= | |
| 6 | SETUP_CPUSETVIRT= | |
| 7 | +SETUP_PERSONALITY= | |
| 8 | +SETUP_MACHINE= | |
| 9 | ||
| 10 | declare -a SETUP_INTERFACES=() | |
| 11 | declare -a SETUP_FLAGS=() | |
| 12 | ||
| 13 | -declare -r SETUP_OPTIONS="confdir:,lockfile:,hostname:,netdev:,netmask:,netprefix:,netbcast:,interface:,flags:,context:,initstyle:,cpuset:,cpusetcpus:,cpusetmems:,cpusetvirt" | |
| 14 | +declare -r SETUP_OPTIONS="confdir:,lockfile:,hostname:,netdev:,netmask:,netprefix:,netbcast:,interface:,flags:,context:,initstyle:,cpuset:,cpusetcpus:,cpusetmems:,cpusetvirt,personality:,machine:" | |
| 15 | declare -r SETUP_HELPMSG=$" | |
| 16 | --context ... the static context of the vserver [default: none; one will | |
| 17 | be generated for you] | |
| 18 | @@ -59,6 +61,10 @@ | |
| 19 | this becomes a per vserver limit) | |
| 20 | private: No other process can join this security context. | |
| 21 | Even root | |
| 22 | + --personality <personality> | |
| 23 | + ... set personality (linux_32bit) [default: none] | |
| 24 | + --machine <uts machine> | |
| 25 | + ... set uts machine (i386, i686, ...) [default: none] | |
| 26 | --cpuset <name> | |
| 27 | ... declares the CPUSET this vserver will run in [default: none] | |
| 28 | --cpusetcpus <number[-number][:<exclusive>]> | |
| 29 | @@ -89,6 +95,8 @@ | |
| 30 | (--netbcast) SETUP_NETBCAST=$2;; | |
| 31 | (--interface) SETUP_INTERFACES=( "${SETUP_INTERFACES[@]}" "$2" );; | |
| 32 | (--initstyle) SETUP_INITSTYLE=$2;; | |
| 33 | + (--personality) SETUP_PERSONALITY=$2;; | |
| 34 | + (--machine) SETUP_MACHINE=$2;; | |
| 35 | (--cpuset) SETUP_CPUSET=$2;; | |
| 36 | (--cpusetcpus) old_IFS=$IFS | |
| 37 | IFS=: | |
| 38 | @@ -211,6 +219,8 @@ | |
| 39 | _setup_writeSingleOption "$SETUP_CPUSETMEMS" "$cfgdir"/cpuset/mems | |
| 40 | _setup_writeSingleOption "$SETUP_CPUSETMEMSEXCL" "$cfgdir"/cpuset/mem_exclusive | |
| 41 | _setup_writeSingleOption "$SETUP_CPUSETVIRT" "$cfgdir"/cpuset/virtualized | |
| 42 | + _setup_writeSingleOption "$SETUP_PERSONALITY" "$cfgdir"/personality | |
| 43 | + _setup_writeSingleOption "$SETUP_MACHINE" "$cfgdir"/uts/machine | |
| 44 | ||
| 45 | local idx=0 | |
| 46 | for i in "${SETUP_INTERFACES[@]}"; do |