emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

allow default rc_sys value to be set at build time

Browse Source 
This allows the default value of rc_sys to be set when openrc is
compiled. This will allow openrc to be installed, e.g. on vserver guests
and will allow them to be rebooted without the need to edit rc.conf.

This patch is a combined effort between myself and Robin Johnson.

X-Gentoo-Bug: 357247
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=357247
This commit is contained in:
William Hubbs 2011-03-04 19:08:08 -06:00
parent 202fa20cbc
commit 3fca6bd027
5 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
README
View File

@ -12,6 +12,7 @@ LIBNAME=lib64
DESTDIR=/tmp/openrc-image DESTDIR=/tmp/openrc-image
MKPAM=pam MKPAM=pam
MKPKGCONFIG=no MKPKGCONFIG=no
MKRCSYS=prefix
MKSELINUX=yes MKSELINUX=yes
MKTERMCAP=ncurses MKTERMCAP=ncurses
MKTERMCAP=termcap MKTERMCAP=termcap
@ -33,6 +34,20 @@ LOCAL_PREFIX should be set when to where user maintained packages are.
Only set LOCAL_PREFIX if different from PKG_PREFIX. Only set LOCAL_PREFIX if different from PKG_PREFIX.
PREFIX should be set when OpenRC is not installed to /. PREFIX should be set when OpenRC is not installed to /.
MKRCSYS should be set only if you need to specify a default system
subtype. The subtype should be set to match the type of environment the
file is installed into, not the virtualization the environment is
capable of handling. Here is a list of subtypes and their meanings.
jail FreeBSD jail
lxc Linux container
openvz Linux OpenVZ
prefix Linux and *BSD prefix system
uml UsermodeLinux
vserver Linux vserver
xen0 Linux and NetBSD xen0 Domain
xenU Linux and NetBSD xenU Domain
If any of the following files exist then we do not overwrite them If any of the following files exist then we do not overwrite them
/etc/devd.conf /etc/devd.conf
/etc/rc /etc/rc

2
etc/rc.conf.FreeBSD
View File

@ -8,5 +8,5 @@
# This should be set to the value representing what environment this file is # This should be set to the value representing what environment this file is
# PRESENTLY in, not what virtualization the environment is capable of. # PRESENTLY in, not what virtualization the environment is capable of.
# See the OpenRC migration guide for more details. # See the OpenRC migration guide for more details.
rc_sys="" rc_sys="@RC_SYS_DEFAULT@"

2
etc/rc.conf.Linux
View File

@ -13,7 +13,7 @@
# This should be set to the value representing what environment this file is # This should be set to the value representing what environment this file is
# PRESENTLY in, not what virtualization the environment is capable of. # PRESENTLY in, not what virtualization the environment is capable of.
# See the OpenRC migration guide for more details. # See the OpenRC migration guide for more details.
rc_sys="" rc_sys="@RC_SYS_DEFAULT@"
############################################################################## ##############################################################################
# LINUX SPECIFIC OPTIONS # LINUX SPECIFIC OPTIONS

2
etc/rc.conf.NetBSD
View File

@ -9,5 +9,5 @@
# This should be set to the value representing what environment this file is # This should be set to the value representing what environment this file is
# PRESENTLY in, not what virtualization the environment is capable of. # PRESENTLY in, not what virtualization the environment is capable of.
# See the OpenRC migration guide for more details. # See the OpenRC migration guide for more details.
rc_sys="" rc_sys="@RC_SYS_DEFAULT@"

2
mk/scripts.mk
View File

@ -12,7 +12,7 @@ _PKG_SED:= $(shell ${_PKG_SED_SH})
_LCL_SED_SH= if test "${PREFIX}" = "${LOCAL_PREFIX}"; then echo "-e 's:@LOCAL_PREFIX@::g'"; else echo "-e 's:@LOCAL_PREFIX@:${LOCAL_PREFIX}:g'"; fi _LCL_SED_SH= if test "${PREFIX}" = "${LOCAL_PREFIX}"; then echo "-e 's:@LOCAL_PREFIX@::g'"; else echo "-e 's:@LOCAL_PREFIX@:${LOCAL_PREFIX}:g'"; fi
_LCL_SED:= $(shell ${_LCL_SED_SH}) _LCL_SED:= $(shell ${_LCL_SED_SH})
SED_REPLACE= -e 's:@SHELL@:${SH}:g' -e 's:@LIB@:${LIBNAME}:g' -e 's:@SYSCONFDIR@:${SYSCONFDIR}:g' -e 's:@LIBEXECDIR@:${LIBEXECDIR}:g' -e 's:@PREFIX@:${PREFIX}:g' ${_PKG_SED} ${_LCL_SED} SED_REPLACE= -e 's:@SHELL@:${SH}:g' -e 's:@LIB@:${LIBNAME}:g' -e 's:@SYSCONFDIR@:${SYSCONFDIR}:g' -e 's:@LIBEXECDIR@:${LIBEXECDIR}:g' -e 's:@PREFIX@:${PREFIX}:g' -e 's:@RC_SYS_DEFAULT@:${MKRCSYS}:g' ${_PKG_SED} ${_LCL_SED}
# Tweak our shell scripts # Tweak our shell scripts
.SUFFIXES: .sh.in .in .SUFFIXES: .sh.in .in