Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 55973 | Differences between
and this patch

Collapse All | Expand All

(-)rc-scripts-1.6.9/init.d/clock (+3 lines)
Lines 3-8 Link Here
3
# Distributed under the terms of the GNU General Public License v2
3
# Distributed under the terms of the GNU General Public License v2
4
# $Header: /var/cvsroot/gentoo-src/rc-scripts/init.d/clock,v 1.24.2.1 2005/01/30 21:23:10 vapier Exp $
4
# $Header: /var/cvsroot/gentoo-src/rc-scripts/init.d/clock,v 1.24.2.1 2005/01/30 21:23:10 vapier Exp $
5
5
6
## vserver incompatible
7
is_vserver_guest && exit 0
8
6
opts="${opts} save"
9
opts="${opts} save"
7
10
8
depend() {
11
depend() {
(-)rc-scripts-1.6.9/init.d/consolefont (+3 lines)
Lines 3-8 Link Here
3
# Distributed under the terms of the GNU General Public License v2
3
# Distributed under the terms of the GNU General Public License v2
4
# $Header: /var/cvsroot/gentoo-src/rc-scripts/init.d/consolefont,v 1.26.4.1 2005/01/30 22:17:37 vapier Exp $
4
# $Header: /var/cvsroot/gentoo-src/rc-scripts/init.d/consolefont,v 1.26.4.1 2005/01/30 22:17:37 vapier Exp $
5
5
6
## vserver incompatible
7
is_vserver_guest && exit 0
8
6
depend() {
9
depend() {
7
	need localmount
10
	need localmount
8
	need keymaps    # sets up terminal encoding scheme
11
	need keymaps    # sets up terminal encoding scheme
(-)rc-scripts-1.6.9/init.d/halt.sh (+3 lines)
Lines 2-7 Link Here
2
# Distributed under the terms of the GNU General Public License v2
2
# Distributed under the terms of the GNU General Public License v2
3
# $Header: /var/cvsroot/gentoo-src/rc-scripts/init.d/halt.sh,v 1.64.2.3 2005/01/30 22:01:18 vapier Exp $
3
# $Header: /var/cvsroot/gentoo-src/rc-scripts/init.d/halt.sh,v 1.64.2.3 2005/01/30 22:01:18 vapier Exp $
4
4
5
## vserver incompatible
6
is_vserver_guest && exit 0
7
5
# Check to see if this is a livecd, if it is read the commandline
8
# Check to see if this is a livecd, if it is read the commandline
6
# this mainly makes sure $CDBOOT is defined if it's a livecd
9
# this mainly makes sure $CDBOOT is defined if it's a livecd
7
[ -f "/sbin/livecd-functions.sh" ] && \
10
[ -f "/sbin/livecd-functions.sh" ] && \
(-)rc-scripts-1.6.9/init.d/localmount (+3 lines)
Lines 3-8 Link Here
3
# Distributed under the terms of the GNU General Public License v2
3
# Distributed under the terms of the GNU General Public License v2
4
# $Header: /var/cvsroot/gentoo-src/rc-scripts/init.d/localmount,v 1.29.4.1 2005/01/30 22:01:18 vapier Exp $
4
# $Header: /var/cvsroot/gentoo-src/rc-scripts/init.d/localmount,v 1.29.4.1 2005/01/30 22:01:18 vapier Exp $
5
5
6
## vserver incompatible
7
is_vserver_guest && exit 0
8
6
depend() {
9
depend() {
7
	need checkfs
10
	need checkfs
8
}
11
}
(-)rc-scripts-1.6.9/init.d/modules (+3 lines)
Lines 3-8 Link Here
3
# Distributed under the terms of the GNU General Public License v2
3
# Distributed under the terms of the GNU General Public License v2
4
# $Header: /var/cvsroot/gentoo-src/rc-scripts/init.d/modules,v 1.32.4.1 2005/01/30 22:17:37 vapier Exp $
4
# $Header: /var/cvsroot/gentoo-src/rc-scripts/init.d/modules,v 1.32.4.1 2005/01/30 22:17:37 vapier Exp $
5
5
6
## vserver incompatible
7
is_vserver_guest && exit 0
8
6
depend() {
9
depend() {
7
	need checkroot hostname
10
	need checkroot hostname
8
	use isapnp
11
	use isapnp
(-)rc-scripts-1.6.9/init.d/net.lo (+3 lines)
Lines 7-12 Link Here
7
# Many thanks to Aron Griffis (agriffis@gentoo.org)
7
# Many thanks to Aron Griffis (agriffis@gentoo.org)
8
# for help, ideas and patches
8
# for help, ideas and patches
9
9
10
## vserver incompatible
11
is_vserver_guest && exit 0
12
10
#NB: Config is in /etc/conf.d/net
13
#NB: Config is in /etc/conf.d/net
11
14
12
if [[ -n ${NET_DEBUG} ]]; then
15
if [[ -n ${NET_DEBUG} ]]; then
(-)rc-scripts-1.6.9/init.d/serial (+3 lines)
Lines 3-8 Link Here
3
# Distributed under the terms of the GNU General Public License v2
3
# Distributed under the terms of the GNU General Public License v2
4
# $Header: /var/cvsroot/gentoo-src/rc-scripts/init.d/serial,v 1.12.4.1 2005/01/30 22:17:37 vapier Exp $
4
# $Header: /var/cvsroot/gentoo-src/rc-scripts/init.d/serial,v 1.12.4.1 2005/01/30 22:17:37 vapier Exp $
5
5
6
## vserver incompatible
7
is_vserver_guest && exit 0
8
6
depend() {
9
depend() {
7
	need localmount
10
	need localmount
8
}
11
}
(-)rc-scripts-1.6.9/sbin/functions.sh (+30 lines)
Lines 658-663 Link Here
658
	return 1
658
	return 1
659
}
659
}
660
660
661
## vserver-support
662
## Idea: we simply check if we are on a root- or v-server and react accordingly.
663
## If there is no "s_context:" at all we have a vanilla (i.e. non-vserver) system
664
## that is treated like a root-server.
665
666
# void get_vserver_context(void)
667
#
668
#   prints the context number if any
669
#
670
get_vserver_context() {
671
	[ -f /proc/$$/status ] && awk '/^s_context:/ { print $2; }' /proc/$$/status
672
}
673
674
# bool is_vserver_host(void)
675
#
676
#   return 0 if we are on the host
677
is_vserver_host() {
678
	local context=$(get_vserver_context)
679
	[ "x${context}" = "x0" -o "x${context}" = "x" ] && return 0
680
	return 1
681
}
682
683
# bool is_vserver_guest(void)
684
#
685
#   return 0 if we are on the guest
686
is_vserver_guest() {
687
	is_vserver_host && return 1
688
	return 0
689
}
690
661
691
662
##############################################################################
692
##############################################################################
663
#                                                                            #
693
#                                                                            #

Return to bug 55973