--- util-vserver-0.30.214/scripts/vserver-setup.functions	2007-09-02 23:06:41.000000000 +0300
+++ util-vserver-0.30.214/scripts/vserver-setup.functions	2008-03-25 20:16:25.000000000 +0200
@@ -28,11 +28,13 @@
 SETUP_CPUSETCPUS=
 SETUP_CPUSETMEMS=
 SETUP_CPUSETVIRT=
+SETUP_PERSONALITY=
+SETUP_MACHINE=
 
 declare -a SETUP_INTERFACES=()
 declare -a SETUP_FLAGS=()
 
-declare -r SETUP_OPTIONS="confdir:,lockfile:,hostname:,netdev:,netmask:,netprefix:,netbcast:,interface:,flags:,context:,initstyle:,cpuset:,cpusetcpus:,cpusetmems:,cpusetvirt"
+declare -r SETUP_OPTIONS="confdir:,lockfile:,hostname:,netdev:,netmask:,netprefix:,netbcast:,interface:,flags:,context:,initstyle:,cpuset:,cpusetcpus:,cpusetmems:,cpusetvirt,personality:,machine:"
 declare -r SETUP_HELPMSG=$"
     --context   ...  the static context of the vserver [default: none; one will
                      be generated for you]
@@ -59,6 +61,10 @@
 			    this becomes a per vserver limit)
 		     private: No other process can join this security context.
 		            Even root
+    --personality <personality>
+                ...  set personality (linux_32bit) [default: none]
+    --machine <uts machine>
+                ...  set uts machine (i386, i686, ...) [default: none]
     --cpuset <name>
                 ...  declares the CPUSET this vserver will run in [default: none]
     --cpusetcpus <number[-number][:<exclusive>]>
@@ -89,6 +95,8 @@
 	(--netbcast)	SETUP_NETBCAST=$2;;
 	(--interface)	SETUP_INTERFACES=( "${SETUP_INTERFACES[@]}" "$2" );;
 	(--initstyle)	SETUP_INITSTYLE=$2;;
+	(--personality)	SETUP_PERSONALITY=$2;;
+	(--machine)	SETUP_MACHINE=$2;;
 	(--cpuset)	SETUP_CPUSET=$2;;
 	(--cpusetcpus)	old_IFS=$IFS
 			IFS=:
@@ -211,6 +219,8 @@
     _setup_writeSingleOption "$SETUP_CPUSETMEMS"     "$cfgdir"/cpuset/mems
     _setup_writeSingleOption "$SETUP_CPUSETMEMSEXCL" "$cfgdir"/cpuset/mem_exclusive
     _setup_writeSingleOption "$SETUP_CPUSETVIRT"     "$cfgdir"/cpuset/virtualized
+    _setup_writeSingleOption "$SETUP_PERSONALITY"    "$cfgdir"/personality
+    _setup_writeSingleOption "$SETUP_MACHINE"    "$cfgdir"/uts/machine
 
     local idx=0
     for i in "${SETUP_INTERFACES[@]}"; do