Backup_Repos/pentoo-overlay
1
0
Fork 0
mirror of https://github.com/pentoo/pentoo-overlay synced 2026-04-19 21:31:10 +02:00
Code Issues Projects Releases Wiki Activity

openrc: version 0.10.5 works better. Cleanup

Browse source
This commit is contained in:
Anton Bolshakov 2012-07-30 15:15:55 +00:00
parent 73e08a527e
commit a6cb04f17e
19 changed files with 448 additions and 1353 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
profiles/pentoo/common/package.accept_keywords/sys-apps
View file

@ -1,4 +1,3 @@
sys-apps/hwsetup **
sys-apps/microcode-data
sys-apps/pkgcore
=sys-apps/openrc-0.9.9.3
~sys-apps/microcode-data-20120606
~sys-apps/pkgcore-0.7.7.8
~sys-apps/openrc-0.10.5

17
sys-apps/openrc/Manifest
View file

@ -1,31 +1,18 @@
AUX 0.5.2/0001-msg-style.patch 1714 RMD160 15a9a9075dce18fb0beece6a3324c143ec973ed2 SHA1 b9082ab1160952a3412be3deb3825d901cce5d49 SHA256 4c819af483240b1c822d25ae3e604376b6255b4577c191bddfc84c309efab08e
AUX 0.5.2/0002-useful-functions.patch 1801 RMD160 5b4ca22e434a3c3d9202e5e95d7dfd4518e0393a SHA1 86f4a4f49989c688269a6e1f95c27ef00f5186ca SHA256 de5e11cd8c514353a5f97b13df52a7220b1b967dd0586336d16864d6c372c62f
AUX 0.5.2/0003-KV.patch 2565 RMD160 62ebe49be43f9b3691400a5a6ebf05c8cb048f0b SHA1 b61e1fe0fc49705a44b0e9fde1d8ec0cfc1e343a SHA256 44be27f8bf419489b29507a8ddab74ff890d6ebcfa316570077393f1c6bac082
AUX 0.5.2/0004-fix-typo.patch 673 RMD160 aeeebc237042564aae1f0e09c38accec8aac3b3a SHA1 f86be91ad8f3c441af6b04fa8cb1ed99c3858a36 SHA256 7065d2368fb8dab56595a7f27d5b00c5d360eb22af35723d6cd9bf06d91b21ac
AUX 0.5.2/0005-fix-iproute2-support.patch 835 RMD160 859e4c8d2c1c8fe8b787432beea370bc955a5e7c SHA1 0cd6fea09ca65945aa86905fc9665d8410186f3c SHA256 491c0444de2d8a11ff17343abb9295e61178db0d3b07e3b075424abe3f287827
AUX 00-linux-link.start 383 RMD160 26fcf955533ed0fec83b6a9c208310e225bac8ba SHA1 bea8d287bedbc592096c541d9ed3bf502d1bbe0b SHA256 1022f30ba59b838dd38d717f95e60e9339e7bd3ca621ca728b432ea6997b3142
AUX 9999/0001-msg-style.patch 1714 RMD160 15a9a9075dce18fb0beece6a3324c143ec973ed2 SHA1 b9082ab1160952a3412be3deb3825d901cce5d49 SHA256 4c819af483240b1c822d25ae3e604376b6255b4577c191bddfc84c309efab08e
AUX 9999/0002-useful-functions.patch 1801 RMD160 5b4ca22e434a3c3d9202e5e95d7dfd4518e0393a SHA1 86f4a4f49989c688269a6e1f95c27ef00f5186ca SHA256 de5e11cd8c514353a5f97b13df52a7220b1b967dd0586336d16864d6c372c62f
AUX 9999/0003-KV.patch 2565 RMD160 62ebe49be43f9b3691400a5a6ebf05c8cb048f0b SHA1 b61e1fe0fc49705a44b0e9fde1d8ec0cfc1e343a SHA256 44be27f8bf419489b29507a8ddab74ff890d6ebcfa316570077393f1c6bac082
AUX compat-wireless.start 773 RMD160 cc043b482b5588269c63d2cf6114eaefab3a595e SHA1 8da39b1b045a6f12252cc9e84121526f604d5a78 SHA256 32e5734a0455f9db5aa93d97cd028fee1a934c5c20dc1c456cb334030569ec7e
AUX openrc-0.5.2-dont-wipe-wtmp.patch 684 RMD160 c1d7df47f123327e03523fc133583a464fc88c71 SHA1 24aa51d63ce6c8b3f9263f41f312f763a9450a44 SHA256 c850f9e948ff1726ec20d73f0afc894e3a010e0285d046eb19b573b781a59e45
AUX openrc-0.5.2-fix-default-domain.patch 682 RMD160 4bd23f777d795401370d8fdac70ca29b7fc16529 SHA1 628513765c65a64e3a586d13e305387b24321095 SHA256 bb49923afdbc8a10e5e2c4a0176ab3e67b047057fc9ae2027f25c88250b29064
AUX openrc-0.5.2-fix-iproute2-support.patch 835 RMD160 859e4c8d2c1c8fe8b787432beea370bc955a5e7c SHA1 0cd6fea09ca65945aa86905fc9665d8410186f3c SHA256 491c0444de2d8a11ff17343abb9295e61178db0d3b07e3b075424abe3f287827
AUX openrc-0.5.2-linux-containers.patch 5413 RMD160 2dad8fb683cafaed306bc9c74b6fb728edf532fa SHA1 d0dff26c4b2c18292e845e02a9ff3798f4cf9399 SHA256 91a5a1f00332abe535e422dc9bd87c2de54e019de521f3f0228b79b8840c5241
AUX openrc-0.5.2-ppp-options.patch 921 RMD160 0d6c82650ed600175b893ef1023f879de7e5c97b SHA1 026b78c6a4c01bf8b5894eab8bf78b5f7931eb26 SHA256 d54c15f241d296e5ed4028967f4f741294e201268b139b5bdebda3ac64053d6f
AUX openrc-0.6.0-fix-bsd-compile.patch 591 RMD160 50e3ce41fa074e9a838b6f1067eb091e9c44b6e4 SHA1 0fb4ade50ba5ec79b2af01bbff1771d47820892c SHA256 ed4b1653fa520ed1fbc761746b20b14c26fb6e344d1111c96908e909ca1c2d45
AUX openrc-0.6.0-fix-vlan.patch 797 RMD160 cc7c5ade98053e02b1df7629dd4fa0c749f646b5 SHA1 eb697b71413ff335fbae970cd6f2295123321d56 SHA256 b32f19a3ded0fa0aac6d649ceb2529fb2b22296958c25462733ac765939d4f69
AUX openrc-0.6.0-typos.patch 23652 RMD160 4e7082b2e87e386229c633d07637d78191897aea SHA1 935ea189125f1b1b36c283ca3ef575e949b5f9cc SHA256 1931799422824bde4b05b5b3c827d4bf2c7e03534e91ea9064d5345f8ad099c5
AUX openrc-0.8.3-ccwgroup.patch 1992 RMD160 7a403f5107b17c200b81e4290292e74ec9f222fe SHA1 228f924991c870e7a9ab227c0b9d99e00dbb3d8a SHA256 5a092cc0ab90507c28f8bd6af34b67fbb3d8a9ddce257195dde55128f87324fc
AUX openrc-0.8.3-deprecation_warning.patch 1055 RMD160 f91a0ca1aba21c9da5e968ae66f709e1751459d1 SHA1 8a07d6106ce4675087224c5cd22d5c9ce01696fb SHA256 fa95aaa34db3556240031fcfb5e33d85e44da2a2f74562faa97c75f569d4efa0
AUX openrc-9999-msg-style.patch 1714 RMD160 15a9a9075dce18fb0beece6a3324c143ec973ed2 SHA1 b9082ab1160952a3412be3deb3825d901cce5d49 SHA256 4c819af483240b1c822d25ae3e604376b6255b4577c191bddfc84c309efab08e
AUX openrc-9999-pause.patch 825 RMD160 737615919d779894e990072a0ff026aeb4fc0a95 SHA1 c9c469d0bfb685a83d8a736467434b22eaf702cd SHA256 ffa34418921d30c589ad762a5d6d7640c37e7279ca19af469912cb9f118cc75d
AUX openrc.logrotate 71 RMD160 4e7370ca873bd917f16e2b8cfc4bc71accbf2353 SHA1 ef1f26020db432f96a1485f72a189b288ef6873b SHA256 0b44210db9770588bd491cd6c0ac9412d99124c6be4c9d3f7d31ec8746072f5c
AUX power_saving.start 631 RMD160 8752a596242e506b90e443ae794b612e1cb08db2 SHA1 892bd2ab9a738db2edee4e36c5ba0007e1d183b3 SHA256 2bd4646a94bacdd9aba77e513bad6395722519d30d3137bebc3144ad038c0a0d
AUX start-stop-daemon.pam 63 RMD160 114c1bbc14f58e5360a2e3136dba06bb953196e4 SHA1 be64dbdc7a99c8260aafdd346c5cb51ced8c1730 SHA256 2681da17e4a122656b5303b7c7eca82b8fb182641290b153fdbe96b63638086d
DIST openrc-0.10.5.tar.bz2 171742 RMD160 e2574acdd77eca817f3730c07c8a0a97cd9f2baf SHA1 3a3a936ac16bc1f8b9604c9e6e85fdf42300250c SHA256 27677142a7aa47a1c7e863fd4bce0d092aca7870012812e4f7a690a14f1e242c
DIST openrc-0.9.4.tar.bz2 163514 RMD160 b0c5b10a562b7a906d762f9b735aa386be6c4afa SHA1 a44f0606db29b6aa2cf98c1907c915e8da5acf4f SHA256 0da3981de88c16b24d14b37d4d2eb0f631cbe5ebe3058dd8c2e32f7092937ae3
DIST openrc-0.9.8.4.tar.bz2 166843 RMD160 2d48429eb2acac513dab803b282eaf495db66be3 SHA1 4987928b46ad37406ceca26bc0d09f4281669b71 SHA256 904e139a90d5f610b59f9e0cc52ddac487c58e4fa73468b5e9fdac1a03362533
DIST openrc-0.9.9.3.tar.bz2 169462 RMD160 a787cfe0ebb3978e77675cfb65f53175d7a88343 SHA1 152765f15ebaf024166d781e70d59996f3f9ec66 SHA256 75487579982eddee9bbc7c3f6515ef8924eefd35c4829361e2b4c4c69bd047ab
EBUILD openrc-0.10.5.ebuild 14621 RMD160 37a650c7b0170f038e965eec395129cea47e69e6 SHA1 9e0217c4ab19833792830f62ecbf2659a94e2754 SHA256 cbe50884f765ee9070af0e243dd6c8d2a05af5c4585775119a21993d8b1e12fc
EBUILD openrc-0.9.4-r1.ebuild 14436 RMD160 9fc6e6ce6a3d8eb76d737e63468a774de7d96aa8 SHA1 b7b1c6d89c8dd3bb68ba9d98dfaa1d6ae267026a SHA256 8b945821399508a079566b01fb409eefd2336127055286eab10f7de6f9ce5453
EBUILD openrc-0.9.8.4.ebuild 14220 RMD160 bacd73fd499c969e3a620f42e08c6895aa1ebbef SHA1 cf317d2ba79aa3912fbfd7e081e60ae01e4ff4be SHA256 869ac4655fbfe56d47c0d7708987fbf07c8a682ad166eff0493fa88cf835515e
EBUILD openrc-0.9.9.3.ebuild 14365 RMD160 0519ce3bc55787e1a047455e92e2cc22bedd96c0 SHA1 a7549ce960433f6870ee938fa1482918425c0439 SHA256 0d3d539312839a0ef7c442302778e16fbf85966207ccea029a6cc579ed805e8d

46
sys-apps/openrc/files/0.5.2/0001-msg-style.patch
View file

@ -1,46 +0,0 @@
From 1eddb56f11b41c4bf4f878c995c5d140b1f9d44d Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 24 Mar 2008 01:48:19 -0400
Subject: [PATCH] This reverts commit 0e2f160c95b15e95f3885e3f5a3670ec5ae0a709. 2 spaces in 80 cols has never made any sort of realistic difference and we're not going to change this behavior in Gentoo.
---
src/libeinfo/libeinfo.c | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/libeinfo/libeinfo.c b/src/libeinfo/libeinfo.c
index f8ddcb5..c46cacb 100644
--- a/src/libeinfo/libeinfo.c
+++ b/src/libeinfo/libeinfo.c
@@ -817,7 +817,7 @@ static void _eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color,
if (!msg)
return;
- cols = get_term_columns(fp) - (strlen(msg) + 3);
+ cols = get_term_columns(fp) - (strlen(msg) + 5);
/* cons25 is special - we need to remove one char, otherwise things
* do not align properly at all. */
@@ -831,18 +831,15 @@ static void _eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color,
if (term_is_cons25)
cols--;
- /* If extra spacing is required around msg, then please change
- * via a runtime knob and leave this default as is as it saves 2
- * valuable columns when running on 80 column screens. */
if (cols > 0 && colour_terminal(fp)) {
- fprintf(fp, "%s%s %s[%s%s%s]%s\n", up, tgoto(goto_column, 0, cols),
+ fprintf(fp, "%s%s %s[%s %s %s]%s\n", up, tgoto(goto_column, 0, cols),
ecolor(ECOLOR_BRACKET), ecolor(color), msg,
ecolor(ECOLOR_BRACKET), ecolor(ECOLOR_NORMAL));
} else {
if (col > 0)
for (i = 0; i < cols - col; i++)
fprintf(fp, " ");
- fprintf(fp, " [%s]\n", msg);
+ fprintf(fp, " [ %s ]\n", msg);
}
}
--
1.5.4.4

78
sys-apps/openrc/files/0.5.2/0002-useful-functions.patch
View file

@ -1,78 +0,0 @@
From 79e8ce8d2ea0ede99aba18d5f9a625a110aa918f Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 24 Mar 2008 02:03:39 -0400
Subject: [PATCH] add a softlevel() function to the API so people dont have to worry about inner details and move get_bootparam back to the exported function.sh api
---
sh/functions.sh.in | 22 ++++++++++++++++++++++
sh/rc-functions.sh.in | 23 -----------------------
2 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/sh/functions.sh.in b/sh/functions.sh.in
index 3f41f8f..be5285c 100644
--- a/sh/functions.sh.in
+++ b/sh/functions.sh.in
@@ -42,6 +42,29 @@ rc_runlevel() {
rc-status --runlevel
}
+get_bootparam()
+{
+ local match="$1"
+ [ -z "$match" -o ! -r /proc/cmdline ] && return 1
+
+ set -- $(cat /proc/cmdline)
+ while [ -n "$1" ]; do
+ [ "$1" = "$match" ] && return 0
+ case "$1" in
+ gentoo=*)
+ local params="${1##*=}"
+ local IFS=, x=
+ for x in $params; do
+ [ "$x" = "$match" ] && return 0
+ done
+ ;;
+ esac
+ shift
+ done
+
+ return 1
+}
+
_sanitize_path()
{
local IFS=":" p= path=
diff --git a/sh/rc-functions.sh.in b/sh/rc-functions.sh.in
index ebdb768..68cd6e7 100644
--- a/sh/rc-functions.sh.in
+++ b/sh/rc-functions.sh.in
@@ -61,29 +61,6 @@ is_union_fs()
unionctl "$1" --list >/dev/null 2>&1
}
-get_bootparam()
-{
- local match="$1"
- [ -z "$match" -o ! -r /proc/cmdline ] && return 1
-
- set -- $(cat /proc/cmdline)
- while [ -n "$1" ]; do
- [ "$1" = "$match" ] && return 0
- case "$1" in
- gentoo=*)
- local params="${1##*=}"
- local IFS=, x=
- for x in $params; do
- [ "$x" = "$match" ] && return 0
- done
- ;;
- esac
- shift
- done
-
- return 1
-}
-
# Add our sbin to $PATH
case "$PATH" in
"$RC_LIBDIR"/sbin|"$RC_LIBDIR"/sbin:*);;

120
sys-apps/openrc/files/0.5.2/0003-KV.patch
View file

@ -1,120 +0,0 @@
From dac703b26c71cd8479b71d101c4e1ddb8eadc194 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 24 Mar 2008 03:14:02 -0400
Subject: [PATCH] add back KV_* funcs
---
sh/functions.sh.in | 35 +++++++++++++++++++++++++++++++++++
sh/runtests.sh | 45 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 80 insertions(+), 0 deletions(-)
diff --git a/sh/functions.sh.in b/sh/functions.sh.in
index 140f6dc..0522792 100644
--- a/sh/functions.sh.in
+++ b/sh/functions.sh.in
@@ -65,6 +65,41 @@ get_bootparam()
return 1
}
+KV_major() {
+ [ -z "$*" ] && return 1
+ local KV="$*"
+ echo ${KV%%.*}
+}
+
+KV_minor() {
+ [ -z "$*" ] && return 1
+ local KV="$*"
+ KV=${KV#*.}
+ echo ${KV%%.*}
+}
+
+KV_micro() {
+ [ -z "$*" ] && return 1
+ local KV="$*"
+ KV=${KV#*.*.}
+ echo ${KV%%[![:digit:]]*}
+}
+
+KV_to_int() {
+ [ -z "$*" ] && return 1
+ local KV_MAJOR="$(KV_major "$*")"
+ local KV_MINOR="$(KV_minor "$*")"
+ local KV_MICRO="$(KV_micro "$*")"
+ local KV_int="$(( KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO ))"
+ echo "${KV_int}"
+}
+
+_RC_GET_KV_CACHE=""
+get_KV() {
+ [ -z ${_RC_GET_KV_CACHE} ] && _RC_GET_KV_CACHE=$(uname -r)
+ echo $(KV_to_int "${_RC_GET_KV_CACHE}")
+}
+
_sanitize_path()
{
local IFS=":" p= path=
diff --git a/sh/runtests.sh b/sh/runtests.sh
index d0d6a17..debcf4f 100755
--- a/sh/runtests.sh
+++ b/sh/runtests.sh
@@ -3,6 +3,19 @@
: ${top_srcdir:=..}
. $top_srcdir/test/setup_env.sh
+checkit() {
+ local output=$($1 $3)
+ local lret=$?
+ if [ ${lret} -ne 0 ] ; then
+ ((tret+=lret))
+ echo "FAIL: exec: $*"
+ fi
+ if [ "${output}" != "$2" ] ; then
+ ((tret+=lret))
+ echo "FAIL: output: $* : got='${output}' wanted='$2'"
+ fi
+}
+
ret=0
tret=0
@@ -22,4 +35,36 @@ done
eend $tret
ret=$(($ret + $tret))
+compare_int() {
+ local got=$(KV_to_int $1)
+ local exp=$(KV_to_int $3)
+ if ! [ ${got} $2 ${exp} ] ; then
+ ((tret+=1))
+ echo "FAIL: KV_to_int '${v}'(${got}) $2 '1.2.2'(${exp})"
+ fi
+}
+
+tret=0
+ebegin "Testing KV_{major,minor,micro,to_int}"
+for v in \
+ 1.2.3 1.2.3-rc0 1.2.3_rc0 "1.2.3 rc0" \
+ 1.2.3.4 1.2.3.4-rc0 1.2.3.4_rc0 "1.2.3.4 rc0"
+do
+ checkit KV_major 1 ${v}
+ checkit KV_minor 2 ${v}
+ checkit KV_micro 3 ${v}
+
+ compare_int 1.2.2 -lt ${v}
+ compare_int 1.2.2.10 -lt ${v}
+ compare_int 1.2.4 -gt ${v}
+ compare_int 1.2.4-rc0 -gt ${v}
+ compare_int 1.2.3 -eq ${v}
+ compare_int 1.2.3-rc0 -eq ${v}
+ compare_int 1.2.3.2 -eq ${v}
+ compare_int 1.2.3.3 -eq ${v}
+ compare_int 1.2.3.4 -eq ${v}
+done
+eend ${tret}
+: $((ret+=tret))
+
exit $ret
--
1.5.4.4

25
sys-apps/openrc/files/0.5.2/0004-fix-typo.patch
View file

@ -1,25 +0,0 @@
From 5783aaed9e318853f98857633f647c96d5142e42 Mon Sep 17 00:00:00 2001
From: William Hubbs <w.d.hubbs@gmail.com>
Date: Sun, 18 Oct 2009 17:29:58 -0500
Subject: [PATCH] fix typo
---
init.d/network.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/init.d/network.in b/init.d/network.in
index 5e60963..7f64b17 100644
--- a/init.d/network.in
+++ b/init.d/network.in
@@ -174,7 +174,7 @@ start()
{
local cr=0 r= int= intv= cmd= args= upcmd=
- if [ -z "$domainname" && -s /etc/defaultdomain ]; then
+ if [ -z "$domainname" -a -s /etc/defaultdomain ]; then
domainname=$(cat /etc/defaultdomain)
fi
if [ -n "$domainname" ]; then
--
1.6.4.4

31
sys-apps/openrc/files/0.5.2/0005-fix-iproute2-support.patch
View file

@ -1,31 +0,0 @@
From aa6d81180167192ad41a73e896f58db89a81d371 Mon Sep 17 00:00:00 2001
From: William Hubbs <w.d.hubbs@gmail.com>
Date: Mon, 19 Oct 2009 22:25:40 -0500
Subject: [PATCH] fix iproute2 support for gentoo bug 289762
---
init.d/network.in | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/init.d/network.in b/init.d/network.in
index 5e60963..396c67d 100644
--- a/init.d/network.in
+++ b/init.d/network.in
@@ -109,11 +109,11 @@ runip()
local int="$1" err=
shift
- err=$(LC_ALL=C ip address add "$@" dev "$int" 2>&1)
+ err=$(LC_ALL=C ip address add "$@" dev "$int" brd + 2>&1)
if [ -z "$err" ]; then
# ip does not bring up the interface when adding addresses
- if ! intup; then
- ip set link up dev "$int"
+ if ! $intup; then
+ ip link set "$int" up
intup=true
fi
return 0
--
1.6.4.4

26
sys-apps/openrc/files/openrc-0.5.2-dont-wipe-wtmp.patch
View file

@ -1,26 +0,0 @@
From 3ec425ce9bcd0bb91f74ac7394aa9ee3f10013bd Mon Sep 17 00:00:00 2001
From: William Hubbs <w.d.hubbs@gmail.com>
Date: Wed, 28 Oct 2009 20:53:35 -0500
Subject: [PATCH] Don't wipe wtmp
Thanks to jasiu@belsznica.pl for the patch.
---
init.d/bootmisc.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
index 1ec5748..5e24531 100644
--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -95,7 +95,7 @@ start()
for x in "" $xtra; do
mkutmp /var/run/utmp$x
done
- [ -e /var/log/wtmp ] && mkutmp /var/log/wtmp
+ [ -e /var/log/wtmp ] || mkutmp /var/log/wtmp
eend 0
ebegin "Cleaning /var/run"
--
1.6.4.4

25
sys-apps/openrc/files/openrc-0.5.2-fix-default-domain.patch
View file

@ -1,25 +0,0 @@
From 3c8ea5896a8c7a6f7cc97cff1bd7b3c8a5739a61 Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Sun, 25 Oct 2009 00:03:20 +0100
Subject: [PATCH 1/3] Fix default domain
---
init.d/network.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/init.d/network.in b/init.d/network.in
index 5e60963..7f64b17 100644
--- a/init.d/network.in
+++ b/init.d/network.in
@@ -174,7 +174,7 @@ start()
{
local cr=0 r= int= intv= cmd= args= upcmd=
- if [ -z "$domainname" && -s /etc/defaultdomain ]; then
+ if [ -z "$domainname" -a -s /etc/defaultdomain ]; then
domainname=$(cat /etc/defaultdomain)
fi
if [ -n "$domainname" ]; then
--
1.6.4.4

31
sys-apps/openrc/files/openrc-0.5.2-fix-iproute2-support.patch
View file

@ -1,31 +0,0 @@
From aa6d81180167192ad41a73e896f58db89a81d371 Mon Sep 17 00:00:00 2001
From: William Hubbs <w.d.hubbs@gmail.com>
Date: Mon, 19 Oct 2009 22:25:40 -0500
Subject: [PATCH] fix iproute2 support for gentoo bug 289762
---
init.d/network.in | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/init.d/network.in b/init.d/network.in
index 5e60963..396c67d 100644
--- a/init.d/network.in
+++ b/init.d/network.in
@@ -109,11 +109,11 @@ runip()
local int="$1" err=
shift
- err=$(LC_ALL=C ip address add "$@" dev "$int" 2>&1)
+ err=$(LC_ALL=C ip address add "$@" dev "$int" brd + 2>&1)
if [ -z "$err" ]; then
# ip does not bring up the interface when adding addresses
- if ! intup; then
- ip set link up dev "$int"
+ if ! $intup; then
+ ip link set "$int" up
intup=true
fi
return 0
--
1.6.4.4

202
sys-apps/openrc/files/openrc-0.5.2-linux-containers.patch
View file

@ -1,202 +0,0 @@
From 95ee39ab1c9ce313725098999cf1d05b42f9c126 Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Wed, 4 Nov 2009 19:21:24 +0000
Subject: [PATCH 2/3] Add support for Linux Containers, fixes #202.
Patch by bug reporter.
---
init.d/fsck.in | 2 +-
init.d/hwclock.in | 2 +-
init.d/localmount.in | 2 +-
init.d/modules.in | 2 +-
init.d/mount-ro.in | 2 +-
init.d/numlock.in | 2 +-
init.d/procfs.in | 2 +-
init.d/root.in | 2 +-
init.d/swap.in | 2 +-
init.d/swclock.in | 2 +-
man/runscript.8 | 4 +++-
src/librc/librc.c | 2 ++
src/librc/rc.h.in | 1 +
13 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/init.d/fsck.in b/init.d/fsck.in
index 68cdf14..279e25c 100644
--- a/init.d/fsck.in
+++ b/init.d/fsck.in
@@ -9,7 +9,7 @@ _IFS="
depend()
{
use dev clock modules
- keyword -jail -openvz -prefix -timeout -vserver
+ keyword -jail -openvz -prefix -timeout -vserver -lxc
}
_abort() {
diff --git a/init.d/hwclock.in b/init.d/hwclock.in
index ea9fa34..e99900f 100644
--- a/init.d/hwclock.in
+++ b/init.d/hwclock.in
@@ -28,7 +28,7 @@ depend()
else
before *
fi
- keyword -openvz -prefix -uml -vserver -xenu
+ keyword -openvz -prefix -uml -vserver -xenu -lxc
}
setupopts()
diff --git a/init.d/localmount.in b/init.d/localmount.in
index 89a4801..a4d1116 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -8,7 +8,7 @@ depend()
{
need fsck
use lvm modules mtab
- keyword -jail -openvz -prefix -vserver
+ keyword -jail -openvz -prefix -vserver -lxc
}
start()
diff --git a/init.d/modules.in b/init.d/modules.in
index c2270ff..7c0b993 100644
--- a/init.d/modules.in
+++ b/init.d/modules.in
@@ -7,7 +7,7 @@ description="Loads a user defined list of kernel modules."
depend()
{
use isapnp
- keyword -openvz -prefix -vserver
+ keyword -openvz -prefix -vserver -lxc
}
start()
diff --git a/init.d/mount-ro.in b/init.d/mount-ro.in
index 45e0fab..69032d7 100644
--- a/init.d/mount-ro.in
+++ b/init.d/mount-ro.in
@@ -7,7 +7,7 @@ description="Re-mount filesytems read-only for a clean reboot."
depend()
{
need killprocs savecache
- keyword -prefix -openvz -vserver
+ keyword -prefix -openvz -vserver -lxc
}
start()
diff --git a/init.d/numlock.in b/init.d/numlock.in
index 9d88fa0..7bf3dc7 100644
--- a/init.d/numlock.in
+++ b/init.d/numlock.in
@@ -9,7 +9,7 @@ ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}
depend()
{
need localmount
- keyword -openvz -prefix -vserver
+ keyword -openvz -prefix -vserver -lxc
}
_setleds()
diff --git a/init.d/procfs.in b/init.d/procfs.in
index 712adc2..2b73bd7 100644
--- a/init.d/procfs.in
+++ b/init.d/procfs.in
@@ -8,7 +8,7 @@ depend()
{
use modules devfs
need localmount
- keyword -openvz -prefix -vserver
+ keyword -openvz -prefix -vserver -lxc
}
start()
diff --git a/init.d/root.in b/init.d/root.in
index 6dc37c8..0689060 100644
--- a/init.d/root.in
+++ b/init.d/root.in
@@ -7,7 +7,7 @@ description="Mount the root fs read/write"
depend()
{
need fsck
- keyword -jail -openvz -prefix -vserver
+ keyword -jail -openvz -prefix -vserver -lxc
}
start()
diff --git a/init.d/swap.in b/init.d/swap.in
index 564531b..d99b9b8 100644
--- a/init.d/swap.in
+++ b/init.d/swap.in
@@ -5,7 +5,7 @@
depend()
{
need localmount
- keyword -jail -openvz -prefix -vserver
+ keyword -jail -openvz -prefix -vserver -lxc
}
start()
diff --git a/init.d/swclock.in b/init.d/swclock.in
index 2d091fe..3357fc7 100644
--- a/init.d/swclock.in
+++ b/init.d/swclock.in
@@ -8,7 +8,7 @@ depend()
{
before *
provide clock
- keyword -openvz -prefix -uml -vserver -xenu
+ keyword -openvz -prefix -uml -vserver -xenu -lxc
}
# swclock is an OpenRC built in
diff --git a/man/runscript.8 b/man/runscript.8
index a3e1f2e..22de825 100644
--- a/man/runscript.8
+++ b/man/runscript.8
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd July 1, 2009
+.Dd November 4, 2009
.Dt RUNSCRIPT 8 SMM
.Os OpenRC
.Sh NAME
@@ -143,6 +143,8 @@ When in a jail, exclude this service from any dependencies. The service can
still be run directly.
.It Dv -openvz
Same as -jail, but for OpenVZ systems.
+.It Dv -lxc
+Same as -jail, but for Linux Resource Containers (LXC).
.It Dv -shutdown
Don't stop this service when shutting the system down.
This normally quite safe as remaining daemons will be sent a SIGTERM just
diff --git a/src/librc/librc.c b/src/librc/librc.c
index 96e3195..34bd9e1 100644
--- a/src/librc/librc.c
+++ b/src/librc/librc.c
@@ -233,6 +233,8 @@ rc_sys(void)
return RC_SYS_VSERVER;
else if (exists("/proc/vz/veinfo") && !exists("/proc/vz/version"))
return RC_SYS_OPENVZ;
+ else if (file_regex("/proc/self/cgroup", ":/.+$"))
+ return RC_SYS_LXC;
else if (file_regex("/proc/self/status",
"envID:[[:space:]]*[1-9]"))
return RC_SYS_OPENVZ; /* old test */
diff --git a/src/librc/rc.h.in b/src/librc/rc.h.in
index 373f1d1..4b7977e 100644
--- a/src/librc/rc.h.in
+++ b/src/librc/rc.h.in
@@ -268,6 +268,7 @@ bool rc_service_daemons_crashed(const char *);
* Some services cannot work in these systems, or we do something else. */
#define RC_SYS_JAIL "JAIL"
#define RC_SYS_OPENVZ "OPENVZ"
+#define RC_SYS_LXC "LXC"
#define RC_SYS_PREFIX "PREFIX"
#define RC_SYS_UML "UML"
#define RC_SYS_VSERVER "VSERVER"
--
1.6.4.4

35
sys-apps/openrc/files/openrc-0.5.2-ppp-options.patch
View file

@ -1,35 +0,0 @@
From 4a892a23ba440a90d8a55f6d19d686917fd3e76e Mon Sep 17 00:00:00 2001
From: Nao Nakashima <nao.nakashima@gmail.com>
Date: Wed, 4 Nov 2009 19:40:52 +0000
Subject: [PATCH 3/3] Fix ppp options ordering.
Fixes #205.
---
net/pppd.sh | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/pppd.sh b/net/pppd.sh
index 5967f0b..a8c8882 100644
--- a/net/pppd.sh
+++ b/net/pppd.sh
@@ -90,7 +90,7 @@ pppd_pre_start()
eval passwordset=\$\{password_${IFVAR}-x\}
if [ -n "${username}" ] \
&& [ -n "${password}" -o -z "${passwordset}" ]; then
- opts="${opts} plugin passwordfd.so passwordfd 0"
+ opts="plugin passwordfd.so ${opts} passwordfd 0"
fi
if ! ${hasdefaultmetric}; then
@@ -155,7 +155,7 @@ pppd_pre_start()
opts="${opts} connect true"
set -- "$@" "${link}"
fi
- opts="${opts} plugin $1.so"
+ opts="plugin $1.so ${opts}"
shift
opts="${opts} $@"
done
--
1.6.4.4

25
sys-apps/openrc/files/openrc-0.6.0-fix-bsd-compile.patch
View file

@ -1,25 +0,0 @@
From bb45f0eabc8e768296cdf678ff8552a28342080a Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Fri, 8 Jan 2010 00:22:04 +0000
Subject: [PATCH] Fix BSD compile.
---
conf.d/Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/conf.d/Makefile b/conf.d/Makefile
index b985271..034dc74 100644
--- a/conf.d/Makefile
+++ b/conf.d/Makefile
@@ -11,7 +11,7 @@ include ${MK}/scripts.mk
SOS?= BSD
-network: network.in network.${OS}
+network: network.in network.${SOS}
cp $@.in $@
[ -e $@.${SOS} ] && cat $@.${SOS} >> $@ || true
--
1.6.4.4

26
sys-apps/openrc/files/openrc-0.6.0-fix-vlan.patch
View file

@ -1,26 +0,0 @@
From f434c902a521deb3e6d057c3ffa4c11f9875a81b Mon Sep 17 00:00:00 2001
From: Daniel Mierswa <impulze@impulze.org>
Date: Wed, 30 Dec 2009 21:02:08 +0100
Subject: [PATCH] Use IFACE variable instead of iface.
Signed-off-by: Daniel Mierswa <impulze@impulze.org>
---
net/vlan.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/net/vlan.sh b/net/vlan.sh
index 48838ef..d54adeb 100644
--- a/net/vlan.sh
+++ b/net/vlan.sh
@@ -87,7 +87,7 @@ vlan_post_start()
# We need to work out the interface name of our new vlan id
local ifname="$(sed -n -e \
- 's/^\([^[:space:]]*\) *| '"${vlan}"' *| .*'"${iface}"'$/\1/p' \
+ 's/^\([^[:space:]]*\) *| '"${vlan}"' *| .*'"${IFACE}"'$/\1/p' \
/proc/net/vlan/config )"
mark_service_started "net.${ifname}"
(
--
1.6.4.4

588
sys-apps/openrc/files/openrc-0.6.0-typos.patch
View file

@ -1,588 +0,0 @@
From ecf9ef49a724f6b95039bd760893f51a920f017b Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Fri, 8 Jan 2010 03:39:25 -0500
Subject: [PATCH] random spelling fixes
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
README | 4 ++--
README.net | 6 +++---
doc/net.example.BSD.in | 20 ++++++++++----------
doc/net.example.Linux.in | 32 ++++++++++++++++----------------
etc/rc.conf.in | 2 +-
init.d/procfs.in | 2 +-
man/einfo.3 | 2 +-
man/rc-status.8 | 2 +-
man/rc_find_pids.3 | 2 +-
man/rc_plugin_hook.3 | 2 +-
man/runscript.8 | 18 +++++++++---------
man/start-stop-daemon.8 | 4 ++--
net/tuntap.sh | 2 +-
src/librc/librc.c | 2 +-
src/librc/rc.h.in | 12 ++++++------
src/rc/fstabinfo.c | 2 +-
src/rc/rc-applets.c | 2 +-
src/rc/runscript.c | 6 +++---
18 files changed, 61 insertions(+), 61 deletions(-)
diff --git a/README b/README
index c153637..92c9bcf 100644
--- a/README
+++ b/README
@@ -41,7 +41,7 @@ If any of the following files exist then we do not overwrite them
rc and rc.shutdown are the hooks from the BSD init into OpenRC.
devd.conf is modified from FreeBSD to call /etc/rc.devd which is a generic
hook into OpenRC.
-inittab is the same, but for SysVInit as used by most Linux distrubtions.
+inittab is the same, but for SysVInit as used by most Linux distributions.
This can be found in the support folder.
Obviously, if you're installing this onto a system that does not use OpenRC
by default then you may wish to backup the above listed files, remove them
@@ -66,7 +66,7 @@ History - by Roy Marples
------------------------
I became a Gentoo/Linux developer in 2004 and wrote the modular network
scripts for the Gentoo baselayout package. baselayout is a collection of
-bash scripts to bring up your computer and it's services.
+bash scripts to bring up your computer and its services.
Then towards the end of 2005 I found myself as the primary maintainer
for baselayout.
diff --git a/README.net b/README.net
index 402408e..41db1c5 100644
--- a/README.net
+++ b/README.net
@@ -12,8 +12,8 @@ In the Perfect World (TM) ifconfig should be able to configure everything
about the interface easily * . The BSD family almost get this right and Linux
epically fails.
-* Only static confguration, including link setup.
-For dynmaic, static, IPv4LL, arping and per ssid IPv4 setup dhcpcd-5.x
+* Only static configuration, including link setup.
+For dynamic, static, IPv4LL, arping and per ssid IPv4 setup dhcpcd-5.x
provides your needs.
It fails because there are many tools to do the same job and often have
@@ -31,6 +31,6 @@ currently available. It's just harder as you have to know them and their
documentation can be lacking at times.
The correct end goal is a BSD style ifconfig tool.
I've started work on it, but the project has stalled somewhat.
-It's display only right now and the source is not yet publically available.
+It's display only right now and the source is not yet publicly available.
If you have the skills and share the vision then contact me privately and
we'll take it from there.
diff --git a/doc/net.example.BSD.in b/doc/net.example.BSD.in
index 1e38ee3..977011e 100644
--- a/doc/net.example.BSD.in
+++ b/doc/net.example.BSD.in
@@ -12,7 +12,7 @@
# kernel then remove the IPv6 address from your config.
# If you want to use a static address or use DHCP explicitly, jump
-# down to the section labelled INTERFACE HANDLERS.
+# down to the section labeled INTERFACE HANDLERS.
#
# If you want to do anything more fancy, you should take the time to
# read through the rest of this file.
@@ -22,10 +22,10 @@
#
# We now support modular networking scripts which means we can easily
# add support for new interface types and modules while keeping
-# compatability with existing ones.
+# compatibility with existing ones.
#
# Modules load by default if the package they need is installed. If
-# you specify a module here that doesn't have it's package installed
+# you specify a module here that doesn't have its package installed
# then you get an error stating which package you need to install.
# Ideally, you only use the modules setting when you have two or more
# packages installed that supply the same service.
@@ -96,8 +96,8 @@
#modules="iwconfig"
# ifconfig (iwconig) support is a one shot script - wpa_supplicant is daemon
-# that scans, assoicates and re-configures if assocation is lost.
-# We call it iwconfig to seperate the wireless setup from ifconfig.
+# that scans, associates and re-configures if association is lost.
+# We call it iwconfig to separate the wireless setup from ifconfig.
####################################
# HINTS
#
@@ -182,7 +182,7 @@
#dns_servers_001122334455="192.168.0.1 192.168.0.2"
# Map a MAC address to an SSID
-# This is used when the Access Point is not broadcasting it's SSID
+# This is used when the Access Point is not broadcasting its SSID
# WARNING: This will override the SSID being broadcast due to some
# Access Points sending an SSID even when they have been configured
# not to!
@@ -193,7 +193,7 @@
# This lists the preferred SSIDs to connect to in order
# SSID's can contain any characters here as they must match the broadcast
# SSID exactly.
-# Surround each SSID with the " character and seperate them with a space
+# Surround each SSID with the " character and separate them with a space
# If the first SSID isn't found then it moves onto the next
# If this isn't defined then it connects to the first one found
#preferred_aps="SSID1 SSID2"
@@ -208,9 +208,9 @@
# any other available AP
# "preferredonly" means it will only connect to visible APs in the preferred
# list
-# "forcepreferred" means it will forceably connect to APs in order if it does
+# "forcepreferred" means it will forcibly connect to APs in order if it does
# not find them in a scan
-# "forcepreferredonly" means it forceably connects to the APs in order and
+# "forcepreferredonly" means it forcibly connects to the APs in order and
# does not bother to scan
# "forceany" does the same as forcepreferred + connects to any other
# available AP
@@ -320,7 +320,7 @@
# Set generic DHCP options like so
#dhcp_eth0="release nodns nontp nonis nogateway nosendhost"
-# This tells the dhcp client to release it's lease when it stops, not to
+# This tells the dhcp client to release its lease when it stops, not to
# overwrite dns, ntp and nis settings, not to set a default route and not to
# send the current hostname to the dhcp server and when it starts.
# You can use any combination of the above options - the default is not to
diff --git a/doc/net.example.Linux.in b/doc/net.example.Linux.in
index af023e6..ba56a12 100644
--- a/doc/net.example.Linux.in
+++ b/doc/net.example.Linux.in
@@ -12,7 +12,7 @@
# kernel then remove the IPv6 address from your config.
# If you want to use a static address or use DHCP explicitly, jump
-# down to the section labelled INTERFACE HANDLERS.
+# down to the section labeled INTERFACE HANDLERS.
#
# If you want to do anything more fancy, you should take the time to
# read through the rest of this file.
@@ -23,10 +23,10 @@
#
# We now support modular networking scripts which means we can easily
# add support for new interface types and modules while keeping
-# compatability with existing ones.
+# compatibility with existing ones.
#
# Modules load by default if the package they need is installed. If
-# you specify a module here that doesn't have it's package installed
+# you specify a module here that doesn't have its package installed
# then you get an error stating which package you need to install.
# Ideally, you only use the modules setting when you have two or more
# packages installed that supply the same service.
@@ -106,7 +106,7 @@
# Each module described below can set a default base metric, lower is
# preferred over higher. This is so we can prefer a wired route over a
-# wireless route automaticaly. You can override this by setting
+# wireless route automatically. You can override this by setting
#metric_eth0="100"
# or on a global basis
#metric="100"
@@ -253,7 +253,7 @@
#key_SSID="s:foobar enc open"
#key_SSID="1234-5678-9012 enc open"
-# You may want to set muliple keys - here's an example
+# You may want to set multiple keys - here's an example
# It sets 4 keys on the card and instructs to use key 2 by default
#key_SSID="[1] s:passkey1 key [2] s:passkey2 key [3] s:passkey3 key [4] s:passkey4 key [2]"
@@ -283,7 +283,7 @@
#dns_servers_001122334455="192.168.0.1 192.168.0.2"
# Map a MAC address to an SSID
-# This is used when the Access Point is not broadcasting it's SSID
+# This is used when the Access Point is not broadcasting its SSID
# WARNING: This will override the SSID being broadcast due to some
# Access Points sending an SSID even when they have been configured
# not to!
@@ -294,7 +294,7 @@
# This lists the preferred SSIDs to connect to in order
# SSID's can contain any characters here as they must match the broadcast
# SSID exactly.
-# Surround each SSID with the " character and seperate them with a space
+# Surround each SSID with the " character and separate them with a space
# If the first SSID isn't found then it moves onto the next
# If this isn't defined then it connects to the first one found
#preferred_aps="SSID1 SSID2"
@@ -307,9 +307,9 @@
# "any" means it will connect to visible APs in the preferred list and then any
# other available AP
# "preferredonly" means it will only connect to visible APs in the preferred list
-# "forcepreferred" means it will forceably connect to APs in order if it does not find
+# "forcepreferred" means it will forcibly connect to APs in order if it does not find
# them in a scan
-# "forcepreferredonly" means it forceably connects to the APs in order and does not bother
+# "forcepreferredonly" means it forcibly connects to the APs in order and does not bother
# to scan
# "forceany" does the same as forcepreferred + connects to any other available AP
# Default is "any"
@@ -448,7 +448,7 @@
# Set generic DHCP options like so
#dhcp_eth0="release nodns nontp nonis nogateway nosendhost"
-# This tells the dhcp client to release it's lease when it stops, not to
+# This tells the dhcp client to release its lease when it stops, not to
# overwrite dns, ntp and nis settings, not to set a default route and not to
# send the current hostname to the dhcp server and when it starts.
# You can use any combination of the above options - the default is not to
@@ -572,7 +572,7 @@
#config_bond0="null" # You may not want to assign an IP the the bond
# You can also configure the bond here, which must be done via sysfs on 2.6
-# kernels or newer. See the kernel bonding documention for a description of
+# kernels or newer. See the kernel bonding documentation for a description of
# these options.
#arp_ip_target_bond0="+26.0.0.0"
@@ -658,7 +658,7 @@
#
# Dead peer detection
# lcp-echo-interval 15 # Send a LCP echo every 15 seconds
-# lcp-echo-failure 3 # Make peer dead after 3 consective
+# lcp-echo-failure 3 # Make peer dead after 3 consecutive
# # echo-requests
#
# Compression options - use these to completely disable compression
@@ -822,8 +822,8 @@
#config_nas0="'192.168.0.1/24'"
#-----------------------------------------------------------------------------
-# Tunnelling
-# WARNING: For tunnelling it is highly recommended that you
+# Tunneling
+# WARNING: For tunneling it is highly recommended that you
# emerge sys-apps/iproute2
#
# For GRE tunnels
@@ -838,7 +838,7 @@
# 6to4 Tunnels allow IPv6 to work over IPv4 addresses, provided you
# have a non-private address configured on an interface.
-# link_6to4="eth0" # Interface to base it's addresses on
+# link_6to4="eth0" # Interface to base its addresses on
# config_6to4="ip6to4"
# You may want to depend on eth0 like so
#rc_need_6to4="net.eth0"
@@ -848,7 +848,7 @@
# sit0 - otherwise use a different name like 6to4 in the example above.
# You can also specify a relay and suffix if you like.
-# The default relay is 192.88.99.1 and the defualt suffix is :1
+# The default relay is 192.88.99.1 and the default suffix is :1
#relay_6to4="192.168.3.2"
#suffix_6to4=":ff"
diff --git a/etc/rc.conf.in b/etc/rc.conf.in
index 0f954ad..a9a80fa 100644
--- a/etc/rc.conf.in
+++ b/etc/rc.conf.in
@@ -2,7 +2,7 @@
# Set to "YES" if you want the rc system to try and start services
# in parallel for a slight speed improvement. When running in parallel we
-# prefix the service output with it's name as the output will get
+# prefix the service output with its name as the output will get
# jumbled up.
# WARNING: whilst we have improved parallel, it can still potentially lock
# the boot process. Don't file bugs about this unless you can supply
diff --git a/init.d/procfs.in b/init.d/procfs.in
index 2b73bd7..c5331b8 100644
--- a/init.d/procfs.in
+++ b/init.d/procfs.in
@@ -13,7 +13,7 @@ depend()
start()
{
- # Make sure we insert usbcore if its a module
+ # Make sure we insert usbcore if it's a module
if [ -f /proc/modules -a ! -d /proc/bus/usb ]; then
modprobe -q usbcore
fi
diff --git a/man/einfo.3 b/man/einfo.3
index 840687e..43fde8b 100644
--- a/man/einfo.3
+++ b/man/einfo.3
@@ -39,7 +39,7 @@
.Nm eprefix
.Nd colorful informational output
.Sh LIBRARY
-Enhanced Informatation output library (libeinfo, -leinfo)
+Enhanced Information output library (libeinfo, -leinfo)
.Sh SYNOPSIS
.In einfo.h
.Ft int Fn einfo "const char * restrict format" ...
diff --git a/man/rc-status.8 b/man/rc-status.8
index 9c9e8f8..8a014c5 100644
--- a/man/rc-status.8
+++ b/man/rc-status.8
@@ -36,7 +36,7 @@
.Nm
gathers and displays information about the status of services
in different runlevels. The default behavior is to show information
-about the current runlevel and any unassgined services that are not stopped,
+about the current runlevel and any unassigned services that are not stopped,
but any runlevel can be quickly examined.
.Pp
The options are as follows:
diff --git a/man/rc_find_pids.3 b/man/rc_find_pids.3
index 28cdc9e..29ea183 100644
--- a/man/rc_find_pids.3
+++ b/man/rc_find_pids.3
@@ -54,7 +54,7 @@ owned by
.Fa uid ,
all of which are optional.
.Pp
-The retuned list should be freed when done.
+The returned list should be freed when done.
.Sh IMPLEMENTATION NOTES
On BSD systems we use
.Lb libkvm
diff --git a/man/rc_plugin_hook.3 b/man/rc_plugin_hook.3
index 3daf7ac..484d101 100644
--- a/man/rc_plugin_hook.3
+++ b/man/rc_plugin_hook.3
@@ -42,7 +42,7 @@ is set to the hook running, and
.Fa name
is set to the name of the runlevel or name of the service.
.Pp
-Plugins can affect the parent environemnt by writing NULL separated strings to
+Plugins can affect the parent environment by writing NULL separated strings to
.Va rc_environ_fd .
.Sh SEE ALSO
.Xr rc 8 ,
diff --git a/man/runscript.8 b/man/runscript.8
index 22de825..33af1d7 100644
--- a/man/runscript.8
+++ b/man/runscript.8
@@ -39,8 +39,8 @@
.Nm
is basically an interpreter for shell scripts which provide an easy interface
to the often complex system commands and daemons.
-When a service runs a command it first loads it's mulitplexed configuration
-file, then it's master configuration file, then
+When a service runs a command it first loads its multiplexed configuration
+file, then its master configuration file, then
.Pa /etc/rc.conf
and finally the script itself. At this point
.Nm
@@ -79,7 +79,7 @@ Ignore all dependency information the service supplies.
Only run the command if the service has been started.
.It Fl q , -quiet
Turns off all informational output the service generates.
-Output from any non OpenRC comands is not affected.
+Output from any non OpenRC commands is not affected.
.It Fl v , -verbose
Turns on any extra informational output the service generates.
.It Fl Z , -dry-run
@@ -90,9 +90,9 @@ or stopping them.
The following variables affect the service script:
.Bl -tag -width "RC_DEFAULTLEVEL"
.It Ar extra_commands
-Space seperated list of extra commands the service defines.
+Space separated list of extra commands the service defines.
.It Ar extra_started_commands
-Space seperated list of extra commands the service defines. These only work if
+Space separated list of extra commands the service defines. These only work if
the service has already been started.
.It Ar description
String describing the service.
@@ -128,7 +128,7 @@ will refuse to stop until any services that need it have stopped.
The service will attempt to start any services we use that have been added
to the runlevel.
.It Ic after
-The service will start after thse services and stop before these services.
+The service will start after these services and stop before these services.
.It Ic before
The service will start before these services and stop after these services.
.It Ic provide
@@ -225,7 +225,7 @@ is newer than
return 0, otherwise 1.
If
.Ar file2
-is a directory, then check all it's contents too.
+is a directory, then check all its contents too.
.It Ic is_older_than Ar file1 Ar file2 ...
If
.Ar file1
@@ -234,7 +234,7 @@ is newer than
return 0, otherwise 1.
If
.Ar file2
-is a directory, then check all it's contents too.
+is a directory, then check all its contents too.
.It Ic service_set_value Ar name Ar value
Saves the
.Ar name
@@ -320,7 +320,7 @@ Configuration files, relative to the location of the service.
If a file ending with .${RC_RUNLEVEL} exists then we use that instead.
.Bl -ohang
.It Pa ../conf.d/${RC_SVCNAME%%.*}
-mulitplexed configuration file.
+multiplexed configuration file.
Example: if ${RC_SVCNAME} is net.eth1 then look for
.Pa ../conf.d/net .
.It Pa ../conf.d/${RC_SVCNAME}
diff --git a/man/start-stop-daemon.8 b/man/start-stop-daemon.8
index 628807d..b49f4f6 100644
--- a/man/start-stop-daemon.8
+++ b/man/start-stop-daemon.8
@@ -43,7 +43,7 @@
.Ar daemon
.Sh DESCRIPTION
.Nm
-provides a consistent method of starting, stopping and signalling daemons.
+provides a consistent method of starting, stopping and signaling daemons.
If neither
.Fl K , -stop
nor
@@ -85,7 +85,7 @@ then
.Nm
matches the process
.D1 /usr/bin/perl -w foo
-If an interpreted daemon changes it's process name then this won't work.
+If an interpreted daemon changes its process name then this won't work.
.It Fl u , -user Ar user Ns Op : Ns Ar group
Start the daemon as the
.Ar user
diff --git a/net/tuntap.sh b/net/tuntap.sh
index 5e9cf0b..2970fdd 100644
--- a/net/tuntap.sh
+++ b/net/tuntap.sh
@@ -26,7 +26,7 @@ tuntap_pre_start()
return 1
fi
vebegin "Waiting for /dev/net/tun"
- # /dev/net/tun can take it's time to appear
+ # /dev/net/tun can take its time to appear
local timeout=10
while [ ! -e /dev/net/tun -a ${timeout} -gt 0 ]; do
sleep 1
diff --git a/src/librc/librc.c b/src/librc/librc.c
index 34bd9e1..fe9e1b6 100644
--- a/src/librc/librc.c
+++ b/src/librc/librc.c
@@ -377,7 +377,7 @@ rc_runlevel_stacks(const char *runlevel)
}
librc_hidden_def(rc_runlevel_stacks)
-/* Resolve a service name to it's full path */
+/* Resolve a service name to its full path */
char *
rc_service_resolve(const char *service)
{
diff --git a/src/librc/rc.h.in b/src/librc/rc.h.in
index 4b7977e..d9d0453 100644
--- a/src/librc/rc.h.in
+++ b/src/librc/rc.h.in
@@ -117,7 +117,7 @@ bool rc_runlevel_stopping(void);
/*! @name RC
* A service can be given as a full path or just its name.
- * If its just a name then we try to resolve the service to a full path.
+ * If it's just a name then we try to resolve the service to a full path.
* This should allow the use if local init.d directories in the future. */
/*! @brief States a service can be in */
@@ -326,7 +326,7 @@ typedef void *RC_DEPTREE;
#endif
/*! Check to see if source is newer than target.
- * If target is a directory then we traverse it and it's children.
+ * If target is a directory then we traverse it and its children.
* @param source
* @param target
* @param mtime of newest target
@@ -335,7 +335,7 @@ typedef void *RC_DEPTREE;
bool rc_newer_than(const char *, const char *, time_t *, char *);
/*! Check to see if source is older than target.
- * If target is a directory then we traverse it and it's children.
+ * If target is a directory then we traverse it and its children.
* @param source
* @param target
* @param mtime of oldest target
@@ -446,7 +446,7 @@ RC_STRINGLIST *rc_config_load(const char *);
/*! Return the value of the entry from a key=value list. */
char *rc_config_value(RC_STRINGLIST *, const char *);
-/*! Check if a variable is a boolean and return it's value.
+/*! Check if a variable is a boolean and return its value.
* If variable is not a boolean then we set errno to be ENOENT when it does
* not exist or EINVAL if it's not a boolean.
* @param variable to check
@@ -485,9 +485,9 @@ bool rc_stringlist_delete(RC_STRINGLIST *, const char *);
* @return pointer to item */
RC_STRING *rc_stringlist_find(RC_STRINGLIST *, const char *);
-/*! Split a string into a stringlist based on seperator.
+/*! Split a string into a stringlist based on separator.
* @param string to split
- * @param seperator
+ * @param separator
* @return new list */
RC_STRINGLIST *rc_stringlist_split(const char *, const char *);
diff --git a/src/rc/fstabinfo.c b/src/rc/fstabinfo.c
index 0dcdfd6..a05bfae 100644
--- a/src/rc/fstabinfo.c
+++ b/src/rc/fstabinfo.c
@@ -38,7 +38,7 @@
#include <string.h>
#include <unistd.h>
-/* Yay for linux and it's non liking of POSIX functions.
+/* Yay for linux and its non liking of POSIX functions.
Okay, we could use getfsent but the man page says use getmntent instead
AND we don't have getfsent on uclibc or dietlibc for some odd reason. */
#ifdef __linux__
diff --git a/src/rc/rc-applets.c b/src/rc/rc-applets.c
index 04e88de..11bc2d5 100644
--- a/src/rc/rc-applets.c
+++ b/src/rc/rc-applets.c
@@ -467,7 +467,7 @@ run_applets(int argc, char **argv)
}
exit(EXIT_FAILURE);
};
- /* This tets is correct as it's not present in baselayout */
+ /* This test is correct as it's not present in baselayout */
if (strcmp(applet, "is_newer_than") == 0) {
if (argc < 3)
exit (EXIT_FAILURE);
diff --git a/src/rc/runscript.c b/src/rc/runscript.c
index 5939dae..0b2d71a 100644
--- a/src/rc/runscript.c
+++ b/src/rc/runscript.c
@@ -998,7 +998,7 @@ svc_restart(void)
* dns via resolvconf, so you could have openvpn trying to restart
* dnsmasq which in turn is waiting on net which in turn is waiting
* on dnsmasq.
- * The work around is for resolvconf to restart it's services with
+ * The work around is for resolvconf to restart its services with
* --nodeps which means just that.
* The downside is that there is a small window when our status is
* invalid.
@@ -1106,7 +1106,7 @@ runscript(int argc, char **argv)
atexit(cleanup);
/* We need to work out the real full path to our service.
- * This works fine, provided that we ONLY allow mulitplexed services
+ * This works fine, provided that we ONLY allow multiplexed services
* to exist in the same directory as the master link.
* Also, the master link as to be a real file in the init dir. */
if (!realpath(argv[1], path)) {
@@ -1192,7 +1192,7 @@ runscript(int argc, char **argv)
deps = true;
- /* Punt the first arg as it's our service name */
+ /* Punt the first arg as its our service name */
argc--;
argv++;
--
1.6.4.4

46
sys-apps/openrc/files/openrc-9999-msg-style.patch
View file

@ -1,46 +0,0 @@
From 1eddb56f11b41c4bf4f878c995c5d140b1f9d44d Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 24 Mar 2008 01:48:19 -0400
Subject: [PATCH] This reverts commit 0e2f160c95b15e95f3885e3f5a3670ec5ae0a709. 2 spaces in 80 cols has never made any sort of realistic difference and we're not going to change this behavior in Gentoo.
---
src/libeinfo/libeinfo.c | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/libeinfo/libeinfo.c b/src/libeinfo/libeinfo.c
index f8ddcb5..c46cacb 100644
--- a/src/libeinfo/libeinfo.c
+++ b/src/libeinfo/libeinfo.c
@@ -817,7 +817,7 @@ static void _eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color,
if (!msg)
return;
- cols = get_term_columns(fp) - (strlen(msg) + 3);
+ cols = get_term_columns(fp) - (strlen(msg) + 5);
/* cons25 is special - we need to remove one char, otherwise things
* do not align properly at all. */
@@ -831,18 +831,15 @@ static void _eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color,
if (term_is_cons25)
cols--;
- /* If extra spacing is required around msg, then please change
- * via a runtime knob and leave this default as is as it saves 2
- * valuable columns when running on 80 column screens. */
if (cols > 0 && colour_terminal(fp)) {
- fprintf(fp, "%s%s %s[%s%s%s]%s\n", up, tgoto(goto_column, 0, cols),
+ fprintf(fp, "%s%s %s[%s %s %s]%s\n", up, tgoto(goto_column, 0, cols),
ecolor(ECOLOR_BRACKET), ecolor(color), msg,
ecolor(ECOLOR_BRACKET), ecolor(ECOLOR_NORMAL));
} else {
if (col > 0)
for (i = 0; i < cols - col; i++)
fprintf(fp, " ");
- fprintf(fp, " [%s]\n", msg);
+ fprintf(fp, " [ %s ]\n", msg);
}
}
--
1.5.4.4

29
sys-apps/openrc/files/openrc-9999-pause.patch
View file

@ -1,29 +0,0 @@
From e82772a6b6d4374e81b7e19a593ffdef16753418 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 21 Dec 2009 09:02:35 -0500
Subject: [PATCH] restore init.d pause option
---
src/rc/runscript.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/rc/runscript.c b/src/rc/runscript.c
index 5939dae..7147902 100644
--- a/src/rc/runscript.c
+++ b/src/rc/runscript.c
@@ -1316,6 +1316,12 @@ runscript(int argc, char **argv)
prefix = NULL;
retval = svc_exec("status", NULL);
} else {
+ if (strcmp(optarg, "pause") == 0) {
+ ewarn("WARNING: 'pause' is deprecated; please use '--nodeps stop'");
+ deps = false;
+ optarg = "stop";
+ }
+
if (strcmp(optarg, "conditionalrestart") == 0 ||
strcmp(optarg, "condrestart") == 0)
{
--
1.6.6.rc3

2
sys-apps/openrc/files/power_saving.start
View file

@ -9,7 +9,7 @@ for i in `find /sys/devices/pci* -name "control"`; do echo "auto" > $i; done
#USB Suspend
for i in /sys/bus/usb/devices/*/power/autosuspend; do echo 1 > $i; done
for i in /sys/bus/usb/devices/*/power/level; do echo auto > $i; done
for i in /sys/bus/usb/devices/*/power/control; do echo auto > $i; done
#disable NMI watchdog (unless we are running a redundant kernel
echo 0 > /proc/sys/kernel/nmi_watchdog

442
sys-apps/openrc/openrc-0.10.5.ebuild Normal file
View file

@ -0,0 +1,442 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.10.5.ebuild,v 1.1 2012/07/04 14:36:33 williamh Exp $
EAPI=4
EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${PN}.git"
[[ ${PV} == "9999" ]] && SCM_ECLASS="git-2"
inherit eutils flag-o-matic multilib pam toolchain-funcs ${SCM_ECLASS}
unset SCM_ECLASS
DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
HOMEPAGE="http://www.gentoo.org/proj/en/base/openrc/"
if [[ ${PV} != "9999" ]] ; then
SRC_URI="mirror://gentoo/${P}.tar.bz2"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
fi
LICENSE="BSD-2"
SLOT="0"
IUSE="debug elibc_glibc ncurses pam pentoo selinux static-libs unicode kernel_linux kernel_FreeBSD"
RDEPEND="virtual/init
kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
elibc_glibc? ( >=sys-libs/glibc-2.5 )
ncurses? ( sys-libs/ncurses )
pam? ( sys-auth/pambase )
>=sys-apps/baselayout-2.1-r1
kernel_linux? (
sys-process/psmisc
)
!<sys-fs/udev-133"
DEPEND="${RDEPEND}
virtual/os-headers"
make_args() {
unset LIBDIR #266688
MAKE_ARGS="${MAKE_ARGS} LIBNAME=$(get_libdir) LIBEXECDIR=/$(get_libdir)/rc"
local brand="Unknown"
if use kernel_linux ; then
MAKE_ARGS="${MAKE_ARGS} OS=Linux"
brand="Linux"
elif use kernel_FreeBSD ; then
MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
brand="FreeBSD"
fi
if use selinux; then
MAKE_ARGS="${MAKE_ARGS} MKSELINUX=yes"
fi
if use pentoo ; then
export BRANDING="Pentoo ${brand}"
else
export BRANDING="Gentoo ${brand}"
fi
if ! use static-libs; then
MAKE_ARGS="${MAKE_ARGS} MKSTATICLIBS=no"
fi
}
pkg_setup() {
export DEBUG=$(usev debug)
export MKPAM=$(usev pam)
export MKTERMCAP=$(usev ncurses)
}
src_prepare() {
sed -i 's:0444:0644:' mk/sys.mk || die
sed -i "/^DIR/s:/openrc:/${PF}:" doc/Makefile || die #241342
if [[ ${PV} == "9999" ]] ; then
local ver="git-${EGIT_VERSION:0:6}"
sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die
fi
# Allow user patches to be applied without modifying the ebuild
epatch_user
}
src_compile() {
make_args
tc-export CC AR RANLIB
emake ${MAKE_ARGS}
}
# set_config <file> <option name> <yes value> <no value> test
# a value of "#" will just comment out the option
set_config() {
local file="${D}/$1" var=$2 val com
eval "${@:5}" && val=$3 || val=$4
[[ ${val} == "#" ]] && com="#" && val='\2'
sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
}
set_config_yes_no() {
set_config "$1" "$2" YES NO "${@:3}"
}
src_install() {
make_args
emake ${MAKE_ARGS} DESTDIR="${D}" install
# move the shared libs back to /usr so ldscript can install
# more of a minimal set of files
# disabled for now due to #270646
#mv "${D}"/$(get_libdir)/lib{einfo,rc}* "${D}"/usr/$(get_libdir)/ || die
#gen_usr_ldscript -a einfo rc
gen_usr_ldscript libeinfo.so
gen_usr_ldscript librc.so
if ! use kernel_linux; then
keepdir /$(get_libdir)/rc/init.d
fi
keepdir /$(get_libdir)/rc/tmp
# Backup our default runlevels
dodir /usr/share/"${PN}"
cp -PR "${D}"/etc/runlevels "${D}"/usr/share/${PN} || die
rm -rf "${D}"/etc/runlevels
# Install the default net configuration
doconfd conf.d/net
# Setup unicode defaults for silly unicode users
set_config_yes_no /etc/rc.conf unicode use unicode
# Cater to the norm
set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
# On HPPA, do not run consolefont by default (bug #222889)
if use hppa; then
rm -f "${D}"/usr/share/openrc/runlevels/boot/consolefont
fi
# Support for logfile rotation
insinto /etc/logrotate.d
newins "${FILESDIR}"/openrc.logrotate openrc
# install the gentoo pam.d file
newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
}
add_boot_init() {
local initd=$1
local runlevel=${2:-boot}
# if the initscript is not going to be installed and is not
# currently installed, return
[[ -e ${D}/etc/init.d/${initd} || -e ${ROOT}/etc/init.d/${initd} ]] \
|| return
[[ -e ${ROOT}/etc/runlevels/${runlevel}/${initd} ]] && return
# if runlevels dont exist just yet, then create it but still flag
# to pkg_postinst that it needs real setup #277323
if [[ ! -d ${ROOT}/etc/runlevels/${runlevel} ]] ; then
mkdir -p "${ROOT}"/etc/runlevels/${runlevel}
touch "${ROOT}"/etc/runlevels/.add_boot_init.created
fi
elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/${runlevel}/${initd}
}
add_boot_init_mit_config() {
local config=$1 initd=$2
if [[ -e ${ROOT}${config} ]] ; then
if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${ROOT}"/${config}) ]] ; then
add_boot_init ${initd}
fi
fi
}
pkg_preinst() {
local f LIBDIR=$(get_libdir)
# default net script is just comments, so no point in biting people
# in the ass by accident. we save in preinst so that the package
# manager doesnt go throwing etc-update crap at us -- postinst is
# too late to prevent that. this behavior also lets us keep the
# file in the CONTENTS for binary packages.
[[ -e ${ROOT}/etc/conf.d/net ]] && cp "${ROOT}"/etc/conf.d/net "${D}"/etc/conf.d/
# avoid default thrashing in conf.d files when possible #295406
if [[ -e ${ROOT}/etc/conf.d/hostname ]] ; then
(
unset hostname HOSTNAME
source "${ROOT}"/etc/conf.d/hostname
: ${hostname:=${HOSTNAME}}
[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
)
fi
# upgrade timezone file ... do it before moving clock
if [[ -e ${ROOT}/etc/conf.d/clock && ! -e ${ROOT}/etc/timezone ]] ; then
(
unset TIMEZONE
source "${ROOT}"/etc/conf.d/clock
[[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${ROOT}"/etc/timezone
)
fi
# /etc/conf.d/clock moved to /etc/conf.d/hwclock
local clock
use kernel_FreeBSD && clock="adjkerntz" || clock="hwclock"
if [[ -e ${ROOT}/etc/conf.d/clock ]] ; then
mv "${ROOT}"/etc/conf.d/clock "${ROOT}"/etc/conf.d/${clock}
fi
if [[ -e ${ROOT}/etc/init.d/clock ]] ; then
rm -f "${ROOT}"/etc/init.d/clock
fi
if [[ -L ${ROOT}/etc/runlevels/boot/clock ]] ; then
rm -f "${ROOT}"/etc/runlevels/boot/clock
ln -snf /etc/init.d/${clock} "${ROOT}"/etc/runlevels/boot/${clock}
fi
if [[ -L ${ROOT}${LIBDIR}/rc/init.d/started/clock ]] ; then
rm -f "${ROOT}${LIBDIR}"/rc/init.d/started/clock
ln -snf /etc/init.d/${clock} "${ROOT}${LIBDIR}"/rc/init.d/started/${clock}
fi
# /etc/conf.d/rc is no longer used for configuration
if [[ -e ${ROOT}/etc/conf.d/rc ]] ; then
elog "/etc/conf.d/rc is no longer used for configuration."
elog "Please migrate your settings to /etc/rc.conf as applicable"
elog "and delete /etc/conf.d/rc"
fi
# force net init.d scripts into symlinks
for f in "${ROOT}"/etc/init.d/net.* ; do
[[ -e ${f} ]] || continue # catch net.* not matching anything
[[ ${f} == */net.lo ]] && continue # real file now
[[ ${f} == *.openrc.bak ]] && continue
if [[ ! -L ${f} ]] ; then
elog "Moved net service '${f##*/}' to '${f##*/}.openrc.bak' to force a symlink."
elog "You should delete '${f##*/}.openrc.bak' if you don't need it."
mv "${f}" "${f}.openrc.bak"
ln -snf net.lo "${f}"
fi
done
# termencoding was added in 0.2.1 and needed in boot
has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
# swapfiles was added in 0.9.9 and needed in boot (february 2012)
has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
# set default interactive shell to sulogin if it exists
set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
has_version sys-apps/openrc || migrate_from_baselayout_1
has_version ">=sys-apps/openrc-0.4.0" || migrate_udev_init_script
}
# >=openrc-0.4.0 no longer loads the udev addon
migrate_udev_init_script() {
# make sure udev is in sysinit if it was enabled before
local enable_udev=false
local rc_devices=$(
[[ -f /etc/rc.conf ]] && source /etc/rc.conf
[[ -f /etc/conf.d/rc ]] && source /etc/conf.d/rc
echo "${rc_devices:-${RC_DEVICES:-auto}}"
)
case ${rc_devices} in
udev|auto)
enable_udev=true
;;
esac
if $enable_udev; then
add_boot_init udev sysinit
add_boot_init udev-postmount default
fi
}
migrate_from_baselayout_1() {
# baselayout boot init scripts have been split out
for f in $(cd "${D}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do
# baselayout-1 is always "old" net, so ignore "new" net
[[ ${f} == "network" ]] && continue
add_boot_init ${f}
done
# Try to auto-add some addons when possible
add_boot_init_mit_config /etc/conf.d/cryptfs dmcrypt
add_boot_init_mit_config /etc/conf.d/dmcrypt dmcrypt
add_boot_init_mit_config /etc/mdadm.conf mdraid
add_boot_init_mit_config /etc/evms.conf evms
[[ -e ${ROOT}/sbin/dmsetup ]] && add_boot_init device-mapper
[[ -e ${ROOT}/sbin/vgscan ]] && add_boot_init lvm
elog "Add on services (such as RAID/dmcrypt/LVM/etc...) are now stand alone"
elog "init.d scripts. If you use such a thing, make sure you have the"
elog "required init.d scripts added to your boot runlevel."
# Upgrade our state for baselayout-1 users
if [[ ! -e ${ROOT}${LIBDIR}/rc/init.d/started ]] ; then
(
[[ -e ${ROOT}/etc/conf.d/rc ]] && source "${ROOT}"/etc/conf.d/rc
svcdir=${svcdir:-/var/lib/init.d}
if [[ ! -d ${ROOT}${svcdir}/started ]] ; then
ewarn "No state found, and no state exists"
elog "You should reboot this host"
else
mkdir -p "${ROOT}${LIBDIR}/rc/init.d"
einfo "Moving state from ${ROOT}${svcdir} to ${ROOT}${LIBDIR}/rc/init.d"
mv "${ROOT}${svcdir}"/* "${ROOT}${LIBDIR}"/rc/init.d
rm -rf "${ROOT}${LIBDIR}"/rc/init.d/daemons \
"${ROOT}${LIBDIR}"/rc/init.d/console
umount "${ROOT}${svcdir}" 2>/dev/null
rm -rf "${ROOT}${svcdir}"
fi
)
fi
# Handle the /etc/modules.autoload.d -> /etc/conf.d/modules transition
if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then
elog "Converting your /etc/modules.autoload.d/ files to /etc/conf.d/modules"
rm -f "${ROOT}"/etc/modules.autoload.d/.keep*
rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null
if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then
local f v
for f in "${ROOT}"/etc/modules.autoload.d/* ; do
v=${f##*/}
v=${v#kernel-}
v=${v//[^[:alnum:]]/_}
gawk -v v="${v}" -v f="${f##*/}" '
BEGIN { print "\n### START: Auto-converted from " f "\n" }
{
if ($0 ~ /^[^#]/) {
print "modules_" v "=\"${modules_" v "} " $1 "\""
gsub(/[^[:alnum:]]/, "_", $1)
printf "module_" $1 "_args_" v "=\""
for (i = 2; i <= NF; ++i) {
if (i > 2)
printf " "
printf $i
}
print "\"\n"
} else
print
}
END { print "\n### END: Auto-converted from " f "\n" }
' "${f}" >> "${D}"/etc/conf.d/modules
done
rm -f "${f}"
rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null
fi
fi
}
pkg_postinst() {
local LIBDIR=$(get_libdir)
# Remove old baselayout links
rm -f "${ROOT}"/etc/runlevels/boot/{check{fs,root},rmnologin}
rm -f "${ROOT}"/etc/init.d/{depscan,runscript}.sh
# Make our runlevels if they don't exist
if [[ ! -e ${ROOT}/etc/runlevels ]] || [[ -e ${ROOT}/etc/runlevels/.add_boot_init.created ]] ; then
einfo "Copying across default runlevels"
cp -RPp "${ROOT}"/usr/share/${PN}/runlevels "${ROOT}"/etc
rm -f "${ROOT}"/etc/runlevels/.add_boot_init.created
else
if [[ ! -e ${ROOT}/etc/runlevels/sysinit/devfs ]] ; then
mkdir -p "${ROOT}"/etc/runlevels/sysinit
cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/sysinit/* \
"${ROOT}"/etc/runlevels/sysinit
fi
if [[ ! -e ${ROOT}/etc/runlevels/shutdown/mount-ro ]] ; then
mkdir -p "${ROOT}"/etc/runlevels/shutdown
cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/shutdown/* \
"${ROOT}"/etc/runlevels/shutdown
fi
fi
# /etc/conf.d/net.example is no longer valid
local NET_EXAMPLE="${ROOT}/etc/conf.d/net.example"
local NET_MD5='8ebebfa07441d39eb54feae0ee4c8210'
if [[ -e "${NET_EXAMPLE}" ]] ; then
if [[ $(md5sum "${NET_EXAMPLE}") == ${NET_MD5}* ]]; then
rm -f "${NET_EXAMPLE}"
elog "${NET_EXAMPLE} has been removed."
else
sed -i '1i# This file is obsolete.\n' "${NET_EXAMPLE}"
elog "${NET_EXAMPLE} should be removed."
fi
elog "The new file is ${ROOT}/usr/share/doc/${PF}/net.example"
fi
# /etc/conf.d/wireless.example is no longer valid
local WIRELESS_EXAMPLE="${ROOT}/etc/conf.d/wireless.example"
local WIRELESS_MD5='d1fad7da940bf263c76af4d2082124a3'
if [[ -e "${WIRELESS_EXAMPLE}" ]] ; then
if [[ $(md5sum "${WIRELESS_EXAMPLE}") == ${WIRELESS_MD5}* ]]; then
rm -f "${WIRELESS_EXAMPLE}"
elog "${WIRELESS_EXAMPLE} is deprecated and has been removed."
else
sed -i '1i# This file is obsolete.\n' "${WIRELESS_EXAMPLE}"
elog "${WIRELESS_EXAMPLE} is deprecated and should be removed."
fi
elog "If you are using the old style network scripts,"
elog "Configure wireless settings in ${ROOT}/etc/conf.d/net"
elog "after reviewing ${ROOT}/usr/share/doc/${PF}/net.example"
fi
if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then
ewarn "/etc/modules.autoload.d is no longer used. Please convert"
ewarn "your files to /etc/conf.d/modules and delete the directory."
fi
if use hppa; then
elog "Setting the console font does not work on all HPPA consoles."
elog "You can still enable it by running:"
elog "# rc-update add consolefont boot"
fi
# Handle the conf.d/local.{start,stop} -> local.d transition
if path_exists -o "${ROOT}"etc/conf.d/local.{start,stop} ; then
elog "Moving your ${ROOT}etc/conf.d/local.{start,stop}"
elog "files to ${ROOT}etc/local.d"
mv "${ROOT}"etc/conf.d/local.start "${ROOT}"etc/local.d/baselayout1.start
mv "${ROOT}"etc/conf.d/local.stop "${ROOT}"etc/local.d/baselayout1.stop
chmod +x "${ROOT}"etc/local.d/*{start,stop}
fi
if use kernel_linux && [[ "${ROOT}" = "/" ]]; then
use pentoo && cp "${FILESDIR}"/*.start "${ROOT}"etc/local.d/
use pentoo && chmod +x "${ROOT}"etc/local.d/*.{start,stop}
if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
ewarn "The dependency data could not be migrated to /run/openrc."
ewarn "This means you need to reboot your system."
fi
fi
# update the dependency tree after touching all files #224171
[[ "${ROOT}" = "/" ]] && "${ROOT}/${LIBDIR}"/rc/bin/rc-depend -u
elog "You should now update all files in /etc, using etc-update"
elog "or equivalent before restarting any services or this host."
elog
elog "Please read the migration guide available at:"
elog "http://www.gentoo.org/doc/en/openrc-migration.xml"
}