diff options
| author |   Christian Heim <phreak@gentoo.org> | 2006-11-05 10:08:38 +0000 |
|---|---|---|
| committer | Christian Heim <phreak@gentoo.org> | 2006-11-05 10:08:38 +0000 |
| commit | 97b89a69dec0d11160eae9faaf773102cf1ddeed (patch) | |
| tree | c8020c999fad9cd2d75cff5b66f52ee5ff93a0e7 /util-vserver/patches/0.30.211-r1/035_all_optional-vlogin.patch | |
| parent | Updating the patches a bit, adding further changes from UPSTREAM. (diff) | |
| download | misc-97b89a69dec0d11160eae9faaf773102cf1ddeed.tar.gz misc-97b89a69dec0d11160eae9faaf773102cf1ddeed.tar.bz2 misc-97b89a69dec0d11160eae9faaf773102cf1ddeed.zip | |
Adding more patches from UPSTREAM, gentoo-tools will be in the next UPSTREAM release, thus 210_all_gentoo-tools.patch is being removed.
svn path=/; revision=519
Diffstat (limited to 'util-vserver/patches/0.30.211-r1/035_all_optional-vlogin.patch')
| -rw-r--r-- | util-vserver/patches/0.30.211-r1/035_all_optional-vlogin.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/util-vserver/patches/0.30.211-r1/035_all_optional-vlogin.patch b/util-vserver/patches/0.30.211-r1/035_all_optional-vlogin.patch new file mode 100644 index 0000000..5a28c46 --- /dev/null +++ b/util-vserver/patches/0.30.211-r1/035_all_optional-vlogin.patch @@ -0,0 +1,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 <guest> enter. ++ </description> ++ </boolean> ++ </collection> + </collection> + + <collection name="interfaces" use="optional"> |