diff options
| author |   Christian Heim <phreak@gentoo.org> | 2006-01-15 10:30:55 +0000 |
|---|---|---|
| committer | Christian Heim <phreak@gentoo.org> | 2006-01-15 10:30:55 +0000 |
| commit | 5579f25688f60a90e4123976c614b47806754c6e (patch) | |
| tree | 2314478594e006ceb280df829ab7f03f23413bc0 | |
| parent | Merging r1822 for branches/baselayout-1_12 (diff) | |
| download | baselayout-vserver-5579f25688f60a90e4123976c614b47806754c6e.tar.gz baselayout-vserver-5579f25688f60a90e4123976c614b47806754c6e.tar.bz2 baselayout-vserver-5579f25688f60a90e4123976c614b47806754c6e.zip | |
Removing {RC,svc}_interactive from etc/conf.d/rc and sbin/rc
svn path=/baselayout-vserver/branches/baselayout-1_12/; revision=207
| -rw-r--r-- | ChangeLog.vserver | 7 | ||||
| -rw-r--r-- | etc/conf.d/rc | 6 | ||||
| -rwxr-xr-x | sbin/rc | 2 |
3 files changed, 3 insertions, 12 deletions
diff --git a/ChangeLog.vserver b/ChangeLog.vserver index 3045ad6..380446f 100644 --- a/ChangeLog.vserver +++ b/ChangeLog.vserver @@ -6,9 +6,8 @@ upon revision 1822. ChangeLog | 24 + - ChangeLog.vserver | 21 + + ChangeLog.vserver | 20 + bin/rc-status | 3 - etc/conf.d/rc | 6 net-scripts/init.d/net.lo | 9 net-scripts/net.modules.d/bonding | 4 net-scripts/net.modules.d/bridge | 4 @@ -16,11 +15,11 @@ net-scripts/net.modules.d/ifconfig | 7 net-scripts/net.modules.d/iproute2 | 5 sbin/functions.sh | 2 - sbin/rc | 6 + sbin/rc | 4 sbin/rc-daemon.sh | 26 - sbin/rc-services.sh | 27 - sbin/runscript.sh | 258 ++++++++++-------- - 15 files changed, 251 insertions(+), 157 deletions(-) + 14 files changed, 242 insertions(+), 157 deletions(-) 11 Jan 2006; Christian Heim <phreak@gentoo.org>: Merging latest changes to the baselayout-1_12 branch. This merge is based diff --git a/etc/conf.d/rc b/etc/conf.d/rc index 7b7145f..e479620 100644 --- a/etc/conf.d/rc +++ b/etc/conf.d/rc @@ -10,12 +10,6 @@ RC_TTY_NUMBER=0 RC_PARALLEL_STARTUP="no" -# Set RC_INTERACTIVE to "yes" and you'll be able to press the I key during -# boot so you can choose to start specific services. Set to "no" to disable -# this feature. - -RC_INTERACTIVE="yes" - # RC_NET_STRICT_CHECKING allows some flexibility with the 'net' service. # The following values are allowed: # none - The 'net' service is always considered up. @@ -194,8 +194,6 @@ then fi source "${svclib}/sh/rc-services.sh" -[[ -e "${svcdir}/interactive" ]] \ - && svcinteractive="$(<${svcdir}/interactive)" if [ -f "${svcdir}/softlevel" ] then |