util-vserver/patches/0.30.211-r1/035_all_optional-vlogin.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49

Index: scripts/vserver
===================================================================
--- scripts/vserver	(revision 2367)
+++ scripts/vserver	(revision 2368)
@@ -227,7 +227,8 @@
 	suexec 0 chkconfig "$@"
 	;;
     (enter)
-	OPTS_VCONTEXT_ENTER=( "${OPTS_VCONTEXT_ENTER[@]}" --vlogin )
+	useVlogin && \
+	  OPTS_VCONTEXT_ENTER=( "${OPTS_VCONTEXT_ENTER[@]}" --vlogin )
 	getEnterShell "$VSERVER_DIR"
 	suexec 0 "${ENTER_SHELL[@]}"
 	;;
Index: scripts/functions
===================================================================
--- scripts/functions	(revision 2367)
+++ scripts/functions	(revision 2368)
@@ -711,6 +711,11 @@
     #$_VKILL -s CONT   --xid "$1" 1 &>/dev/null || :
 }
 
+function useVlogin
+{
+    test ! -e "$__CONFDIR/.defaults/apps/vlogin/disable"
+}
+
 ## Usage: pkgmgmt.guessStyle <vserver> <resultvar>
 function pkgmgmt.guessStyle()
 {
Index: doc/configuration.xml
===================================================================
--- doc/configuration.xml	(revision 2367)
+++ doc/configuration.xml	(revision 2368)
@@ -196,6 +196,14 @@
 	</boolean>
 
       </collection>
+
+      <collection name="vlogin">
+	<boolean id="vlogin-disable" name="disable" since="0.30.212">
+	  <description>
+When this file exists, vlogin isn't used on vserver &lt;guest&gt; enter.
+	  </description>
+	</boolean>
+      </collection>
     </collection>
 
     <collection name="interfaces" use="optional">