summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <williamh@gentoo.org>2010-01-20 16:37:07 +0000
committerWilliam Hubbs <williamh@gentoo.org>2010-01-20 16:37:07 +0000
commit4b170d49eb436b848b74aa3f1ab9166ebab2e563 (patch)
tree09b2d917426725a980511be66ba3b40268bdf6bb /sys-apps/openrc
parentRemove warning with USE=raster as it seems more stable now. (diff)
downloadhistorical-4b170d49eb436b848b74aa3f1ab9166ebab2e563.tar.gz
historical-4b170d49eb436b848b74aa3f1ab9166ebab2e563.tar.bz2
historical-4b170d49eb436b848b74aa3f1ab9166ebab2e563.zip
This new revision fixes #301594, an issue with the vlan support
and several typos. Package-Manager: portage-2.2_rc61/cvs/Linux i686
Diffstat (limited to 'sys-apps/openrc')
-rw-r--r--sys-apps/openrc/ChangeLog28
-rw-r--r--sys-apps/openrc/Manifest6
-rw-r--r--sys-apps/openrc/files/openrc-0.6.0-fix-bsd-compile.patch25
-rw-r--r--sys-apps/openrc/files/openrc-0.6.0-fix-vlan.patch26
-rw-r--r--sys-apps/openrc/files/openrc-0.6.0-typos.patch588
-rw-r--r--sys-apps/openrc/openrc-0.6.0-r1.ebuild410
6 files changed, 1072 insertions, 11 deletions
diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index cf376d2b7189..15076fc465de 100644
--- a/sys-apps/openrc/ChangeLog
+++ b/sys-apps/openrc/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for sys-apps/openrc
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.106 2009/12/22 15:32:29 williamh Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.107 2010/01/20 16:37:07 williamh Exp $
+
+*openrc-0.6.0-r1 (20 Jan 2010)
+
+ 20 Jan 2010; William Hubbs <williamh@gentoo.org> +openrc-0.6.0-r1.ebuild,
+ +files/openrc-0.6.0-fix-bsd-compile.patch,
+ +files/openrc-0.6.0-fix-vlan.patch, +files/openrc-0.6.0-typos.patch:
+ This new revision fixes #301594, an issue with the vlan support
+ and several typos.
22 Dec 2009; William Hubbs <williamh@gentoo.org> -openrc-0.5.3.ebuild:
removed old version
@@ -16,7 +24,7 @@
21 Dec 2009; Mike Frysinger <vapier@gentoo.org> openrc-0.5.3.ebuild,
openrc-9999.ebuild, +files/openrc-9999-pause.patch:
Restore "pause" functionality to teach people to convert #218859 by Martin
- Mokrejš.
+ Mokrejš.
21 Dec 2009; Mike Frysinger <vapier@gentoo.org>
files/openrc-9999-msg-style.patch:
@@ -25,7 +33,7 @@
07 Dec 2009; Mike Frysinger <vapier@gentoo.org> openrc-0.5.3.ebuild,
openrc-9999.ebuild:
Migrate hostname by default to avoid default thrashing on conf.d/hostname
- #295406 by Martin Mokrejš. Also delay automatic dep tree update till
+ #295406 by Martin Mokrejš. Also delay automatic dep tree update till
after we are done screwing with /etc.
06 Dec 2009; William Hubbs <williamh@gentoo.org> -openrc-0.5.2-r2.ebuild,
@@ -139,7 +147,7 @@
15 Oct 2009; Mike Frysinger <vapier@gentoo.org> openrc-0.5.1-r1.ebuild,
openrc-9999.ebuild:
- Relocate docs to normal Gentoo location #241342 by Diego E. Pettenò.
+ Relocate docs to normal Gentoo location #241342 by Diego E. Pettenò.
*openrc-0.5.1-r1 (15 Oct 2009)
@@ -205,14 +213,14 @@
files/9999/0003-KV.patch:
Update patches against latest svn #267540 by Vivien Moreau.
- 18 Apr 2009; Benedikt Böhm <hollow@gentoo.org>
+ 18 Apr 2009; Benedikt Böhm <hollow@gentoo.org>
files/0.4.3/0002-support-custom-status.patch:
backport r1523 and r1524 to fix compile on FreeBSD and still provide the
system status function in custom hooks
*openrc-0.4.3-r2 (18 Apr 2009)
- 18 Apr 2009; Benedikt Böhm <hollow@gentoo.org>
+ 18 Apr 2009; Benedikt Böhm <hollow@gentoo.org>
+files/0.4.3/0002-support-custom-status.patch,
-files/openrc-0.4.3-fix-is_older_than.patch,
+files/0.4.3/0001-fix-is_older_than.patch, openrc-0.4.3-r1.ebuild,
@@ -268,7 +276,7 @@
03 Jan 2009; Jeroen Roovers <jer@gentoo.org> metadata.xml:
Change comment into useable tags.
- 01 Jan 2009; Benedikt Böhm <hollow@gentoo.org>
+ 01 Jan 2009; Benedikt Böhm <hollow@gentoo.org>
+files/0.4.0/0005-init-script-novserver.patch:
fix dmesg and sysfs init script inside vservers, bug #253105
@@ -462,7 +470,7 @@
+openrc-0.2.1-r1.ebuild:
fix bug #216091. crash when stringlist was non-existant
- 03 Apr 2008; Raúl Porcel <armin76@gentoo.org> openrc-0.2.1.ebuild:
+ 03 Apr 2008; Raúl Porcel <armin76@gentoo.org> openrc-0.2.1.ebuild:
Add ~sparc wrt #214957
02 Apr 2008; Doug Goldstein <cardoe@gentoo.org> openrc-0.2.1.ebuild,
@@ -523,7 +531,7 @@
28 Mar 2008; Alexis Ballier <aballier@gentoo.org> openrc-0.2-r1.ebuild:
keyword ~x86-fbsd
- 28 Mar 2008; Raúl Porcel <armin76@gentoo.org> openrc-0.2-r1.ebuild:
+ 28 Mar 2008; Raúl Porcel <armin76@gentoo.org> openrc-0.2-r1.ebuild:
Add ~ia64 wrt #214957
27 Mar 2008; Doug Goldstein <cardoe@gentoo.org> openrc-0.2-r1.ebuild:
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 7d120c946612..1c26def166af 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,8 +1,12 @@
+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-9999-msg-style.patch 2775 RMD160 af958b2a8ed5ad29f25b53bad9a426cf7e173405 SHA1 251b8d0a52bb6e98d80a5213afc4d067583441fc SHA256 637fc2d13e0940b55b7d4613ebf8ebabdee87a802a2690191c01fd5ee7cb3581
AUX openrc-9999-pause.patch 825 RMD160 737615919d779894e990072a0ff026aeb4fc0a95 SHA1 c9c469d0bfb685a83d8a736467434b22eaf702cd SHA256 ffa34418921d30c589ad762a5d6d7640c37e7279ca19af469912cb9f118cc75d
AUX openrc.logrotate 71 RMD160 4e7370ca873bd917f16e2b8cfc4bc71accbf2353 SHA1 ef1f26020db432f96a1485f72a189b288ef6873b SHA256 0b44210db9770588bd491cd6c0ac9412d99124c6be4c9d3f7d31ec8746072f5c
DIST openrc-0.6.0.tar.bz2 154403 RMD160 20710f2c772368d84c46128984bf08e065558268 SHA1 b0475b9ef4ed877a63878325f60c444b0b33454f SHA256 1b302ef12b1c144ae4260d442bd9fa5dd6176c9601d9c1f609ef49f14a1b0728
+EBUILD openrc-0.6.0-r1.ebuild 13455 RMD160 8cc84f557154b9a36d74a2e523848075a26e9b33 SHA1 b9e1bb061c1c82dad4aa13453dd87ec47c580530 SHA256 45e399b948c167780012ebf21ea0dfbaa2d0df617e33bedce145e18471e8837e
EBUILD openrc-0.6.0.ebuild 13322 RMD160 806af067dcfacf007fe75a1ba5bf61cbaeda74f0 SHA1 e16f7dbc5932d0768fb024d10dbb3dc5f8a1ca58 SHA256 f0f9cfc850a5d6ff7c72407116c4337da6e3a38318f5e54758866f9a80737431
EBUILD openrc-9999.ebuild 13322 RMD160 b8aa7bc910d11c980ece41aac065a5f186f0eeed SHA1 3c2a3715016482e142a407146594458e56b61db7 SHA256 7f71689e0df06aed51ff6d4cbbbbc00de08852487342718a475e7d35997e0057
-MISC ChangeLog 21869 RMD160 179dff6c2b342436bb3aeaafc10118817103f879 SHA1 9b714b97d06fac5ff48a407b562c1a51f377d7b5 SHA256 e4a07690b8bef3cf19cc8906706e3e714e7789b105d50fd915de6f3fc72aa76b
+MISC ChangeLog 22197 RMD160 3863626acfce29b97a8e9045b972c23e6e59c845 SHA1 b62b58776d9c3a614d41c98e81498ff5e34e98ce SHA256 20fe77b2ef1c59e5a1b3aa260281953ead17734a5389025811ff96b6aaafd50f
MISC metadata.xml 314 RMD160 ff92ab9cd3f1f3caf25d0be59cf658343d44991c SHA1 d9febb1ce1499c949a2478defda945a3ce716f73 SHA256 4eb82a61b3697027b5ccb1a328a763308c7e090aa23f69fe87b7b7966165fb33
diff --git a/sys-apps/openrc/files/openrc-0.6.0-fix-bsd-compile.patch b/sys-apps/openrc/files/openrc-0.6.0-fix-bsd-compile.patch
new file mode 100644
index 000000000000..903431b87d5f
--- /dev/null
+++ b/sys-apps/openrc/files/openrc-0.6.0-fix-bsd-compile.patch
@@ -0,0 +1,25 @@
+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
+
diff --git a/sys-apps/openrc/files/openrc-0.6.0-fix-vlan.patch b/sys-apps/openrc/files/openrc-0.6.0-fix-vlan.patch
new file mode 100644
index 000000000000..8ac98e39265d
--- /dev/null
+++ b/sys-apps/openrc/files/openrc-0.6.0-fix-vlan.patch
@@ -0,0 +1,26 @@
+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
+
diff --git a/sys-apps/openrc/files/openrc-0.6.0-typos.patch b/sys-apps/openrc/files/openrc-0.6.0-typos.patch
new file mode 100644
index 000000000000..66144e0a814a
--- /dev/null
+++ b/sys-apps/openrc/files/openrc-0.6.0-typos.patch
@@ -0,0 +1,588 @@
+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
+
diff --git a/sys-apps/openrc/openrc-0.6.0-r1.ebuild b/sys-apps/openrc/openrc-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..81e5170a60c3
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.6.0-r1.ebuild
@@ -0,0 +1,410 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.6.0-r1.ebuild,v 1.1 2010/01/20 16:37:07 williamh Exp $
+
+EAPI="1"
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="git://roy.marples.name/openrc.git"
+ inherit git
+ KEYWORDS=""
+else
+ SRC_URI="http://roy.marples.name/downloads/${PN}/${P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="http://roy.marples.name/openrc"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="debug elibc_glibc ncurses pam unicode kernel_linux kernel_FreeBSD"
+
+RDEPEND="virtual/init
+ kernel_FreeBSD? ( sys-process/fuser-bsd )
+ elibc_glibc? ( >=sys-libs/glibc-2.5 )
+ ncurses? ( sys-libs/ncurses )
+ pam? ( virtual/pam )
+ >=sys-apps/baselayout-2.0.0
+ kernel_linux? ( !<sys-apps/module-init-tools-3.2.2-r2 )
+ !<sys-fs/udev-133
+ !<sys-apps/sysvinit-2.86-r11"
+DEPEND="${RDEPEND}
+ virtual/os-headers"
+
+make_args() {
+ unset LIBDIR #266688
+
+ MAKE_ARGS="${MAKE_ARGS} LIBNAME=$(get_libdir) LIBEXECDIR=/$(get_libdir)/rc"
+ MAKE_ARGS="${MAKE_ARGS} MKOLDNET=yes"
+
+ 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
+ export BRANDING="Gentoo ${brand}"
+}
+
+pkg_setup() {
+ export DEBUG=$(usev debug)
+ export MKPAM=$(usev pam)
+ export MKTERMCAP=$(usev ncurses)
+}
+
+src_unpack() {
+ if [[ ${PV} == "9999" ]] ; then
+ git_src_unpack
+ else
+ unpack ${A}
+ fi
+ cd "${S}"
+ sed -i 's:0444:0644:' mk/sys.mk
+ sed -i "/^DIR/s:/openrc:/${PF}:" doc/Makefile #241342
+ sed -i '/^CFLAGS+=.*_CC_FLAGS_SH/d' mk/cc.mk #289264
+ epatch "${FILESDIR}"/${P}-fix-vlan.patch
+ epatch "${FILESDIR}"/${P}-fix-bsd-compile.patch
+ epatch "${FILESDIR}"/${P}-typos.patch
+ epatch "${FILESDIR}"/openrc-9999-msg-style.patch
+ epatch "${FILESDIR}"/openrc-9999-pause.patch
+}
+
+src_compile() {
+ make_args
+
+ if [[ ${PV} == "9999" ]] ; then
+ local ver="git-$(echo ${EGIT_VERSION} | cut -c1-8)"
+ sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk
+ fi
+
+ tc-export CC AR RANLIB
+ emake ${MAKE_ARGS} || die "emake ${MAKE_ARGS} failed"
+}
+
+# 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 || die
+
+ # install the readme for the new network scripts
+ dodoc README.net
+
+ # 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
+
+ keepdir /$(get_libdir)/rc/{init.d,tmp}
+
+ # Backup our default runlevels
+ dodir /usr/share/"${PN}"
+ cp -PR "${D}"/etc/runlevels "${D}"/usr/share/${PN} || die
+ rm -rf "${D}"/etc/runlevels
+
+ # Stick with "old" net as the default for now
+ doconfd conf.d/net || die
+ pushd "${D}"/usr/share/${PN}/runlevels/boot > /dev/null
+ rm -f network staticroute
+ ln -s /etc/init.d/net.lo net.lo
+ popd > /dev/null
+
+ # 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 ')'
+
+ # Support for logfile rotation
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/openrc.logrotate openrc
+}
+
+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
+
+ # 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 out 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}
+
+ # 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
+
+ # 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"
+}