Attachment #208895 for bug #291364

Lines 9-15 _IFS=" Link Here

(-)a/init.d/fsck.in (-1 / +1 lines)
9	depend()	9	depend()
10	{	10	{
11	use dev clock modules	11	use dev clock modules
12	keyword -jail -openvz -prefix -timeout -vserver	12	keyword -jail -openvz -prefix -timeout -vserver -lxc
13	}	13	}
14		14
15	_abort() {	15	_abort() {

Lines 28-34 depend() Link Here

(-)a/init.d/hwclock.in (-1 / +1 lines)
28	else	28	else
29	before *	29	before *
30	fi	30	fi
31	keyword -openvz -prefix -uml -vserver -xenu	31	keyword -openvz -prefix -uml -vserver -xenu -lxc
32	}	32	}
33		33
34	setupopts()	34	setupopts()

Lines 8-14 depend() Link Here

(-)a/init.d/localmount.in (-1 / +1 lines)
8	{	8	{
9	need fsck	9	need fsck
10	use lvm modules mtab	10	use lvm modules mtab
11	keyword -jail -openvz -prefix -vserver	11	keyword -jail -openvz -prefix -vserver -lxc
12	}	12	}
13		13
14	start()	14	start()

Lines 7-13 description="Loads a user defined list of kernel modules." Link Here

(-)a/init.d/modules.in (-1 / +1 lines)
7	depend()	7	depend()
8	{	8	{
9	use isapnp	9	use isapnp
10	keyword -openvz -prefix -vserver	10	keyword -openvz -prefix -vserver -lxc
11	}	11	}
12		12
13	start()	13	start()

Lines 7-13 description="Re-mount filesytems read-only for a clean reboot." Link Here

(-)a/init.d/mount-ro.in (-1 / +1 lines)
7	depend()	7	depend()
8	{	8	{
9	need killprocs savecache	9	need killprocs savecache
10	keyword -prefix -openvz -vserver	10	keyword -prefix -openvz -vserver -lxc
11	}	11	}
12		12
13	start()	13	start()

Lines 9-15 ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}} Link Here

(-)a/init.d/numlock.in (-1 / +1 lines)
9	depend()	9	depend()
10	{	10	{
11	need localmount	11	need localmount
12	keyword -openvz -prefix -vserver	12	keyword -openvz -prefix -vserver -lxc
13	}	13	}
14		14
15	_setleds()	15	_setleds()

Lines 8-14 depend() Link Here

(-)a/init.d/procfs.in (-1 / +1 lines)
8	{	8	{
9	use modules devfs	9	use modules devfs
10	need localmount	10	need localmount
11	keyword -openvz -prefix -vserver	11	keyword -openvz -prefix -vserver -lxc
12	}	12	}
13		13
14	start()	14	start()

Lines 7-13 description="Mount the root fs read/write" Link Here

(-)a/init.d/root.in (-1 / +1 lines)
7	depend()	7	depend()
8	{	8	{
9	need fsck	9	need fsck
10	keyword -jail -openvz -prefix -vserver	10	keyword -jail -openvz -prefix -vserver -lxc
11	}	11	}
12		12
13	start()	13	start()

Lines 5-11 Link Here

(-)a/init.d/swap.in (-1 / +1 lines)
5	depend()	5	depend()
6	{	6	{
7	need localmount	7	need localmount
8	keyword -jail -openvz -prefix -vserver	8	keyword -jail -openvz -prefix -vserver -lxc
9	}	9	}
10		10
11	start()	11	start()

Lines 8-14 depend() Link Here

(-)a/init.d/swclock.in (-1 / +1 lines)
8	{	8	{
9	before *	9	before *
10	provide clock	10	provide clock
11	keyword -openvz -prefix -uml -vserver -xenu	11	keyword -openvz -prefix -uml -vserver -xenu -lxc
12	}	12	}
13		13
14	# swclock is an OpenRC built in	14	# swclock is an OpenRC built in

Lines 143-148 When in a jail, exclude this service from any dependencies. The service can Link Here

(-)a/man/runscript.8 (+2 lines)
143	still be run directly.	143	still be run directly.
144	.It Dv -openvz	144	.It Dv -openvz
145	Same as -jail, but for OpenVZ systems.	145	Same as -jail, but for OpenVZ systems.
		146	.It Dv -lxc
		147	Same as -jail, but for Linux Resource Containers (LXC).
146	.It Dv -shutdown	148	.It Dv -shutdown
147	Don't stop this service when shutting the system down.	149	Don't stop this service when shutting the system down.
148	This normally quite safe as remaining daemons will be sent a SIGTERM just	150	This normally quite safe as remaining daemons will be sent a SIGTERM just

Lines 233-238 rc_sys(void) Link Here

(-)a/src/librc/librc.c (+2 lines)
233	return RC_SYS_VSERVER;	233	return RC_SYS_VSERVER;
234	else if (exists("/proc/vz/veinfo") && !exists("/proc/vz/version"))	234	else if (exists("/proc/vz/veinfo") && !exists("/proc/vz/version"))
235	return RC_SYS_OPENVZ;	235	return RC_SYS_OPENVZ;
		236	else if (file_regex("/proc/self/cgroup", ":/.+$"))
		237	return RC_SYS_LXC;
236	else if (file_regex("/proc/self/status",	238	else if (file_regex("/proc/self/status",
237	"envID:[[:space:]]*[1-9]"))	239	"envID:[[:space:]]*[1-9]"))
238	return RC_SYS_OPENVZ; /* old test */	240	return RC_SYS_OPENVZ; /* old test */

Lines 268-273 bool rc_service_daemons_crashed(const char *); Link Here

(-)a/src/librc/rc.h.in (+1 lines)
268	* Some services cannot work in these systems, or we do something else. */	268	* Some services cannot work in these systems, or we do something else. */
269	#define RC_SYS_JAIL "JAIL"	269	#define RC_SYS_JAIL "JAIL"
270	#define RC_SYS_OPENVZ "OPENVZ"	270	#define RC_SYS_OPENVZ "OPENVZ"
		271	#define RC_SYS_LXC "LXC"
271	#define RC_SYS_PREFIX "PREFIX"	272	#define RC_SYS_PREFIX "PREFIX"
272	#define RC_SYS_UML "UML"	273	#define RC_SYS_UML "UML"
273	#define RC_SYS_VSERVER "VSERVER"	274	#define RC_SYS_VSERVER "VSERVER"

Return to bug 291364