summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog55
-rw-r--r--ChangeLog.vserver1165
-rw-r--r--etc/conf.d/rc21
-rw-r--r--etc/services2
-rw-r--r--net-scripts/net.modules.d/ifconfig1
-rw-r--r--net-scripts/net.modules.d/iwconfig14
-rwxr-xr-xsbin/init-common-post.sh6
-rwxr-xr-xsbin/rc18
-rwxr-xr-xsbin/rc-daemon.sh9
-rwxr-xr-xsbin/runscript.sh46
-rw-r--r--src/consoletype.c59
11 files changed, 771 insertions, 625 deletions
diff --git a/ChangeLog b/ChangeLog
index cbf86f4..cda09a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,9 +5,57 @@
Give a better error message when no valid DHCP client is installed.
+ 29 Jan 2006; Mike Frysinger <vapier@gentoo.org>:
+
+ Update modules-update to run depmod even if /proc/modules doesn't exist
+ and warn if the depdir doesn't exist but the user ran in verbose mode
+ #117212 by Alex Guensche.
+
+ 26 Jan 2006; Mike Frysinger <vapier@gentoo.org>:
+
+ Add fixes by Robert Millan to consoletype so that it's more portable #80021.
+
+ Fix grepping of --assume-kernel in modules-update as pointed out by
+ Patrick McLean in #117212.
+
+ Make sure / is actually read-only before trying to remount it read/write
+ (to fix people using like unionfs for /) #118646 by Alun Jones.
+
+ 25 Jan 2006; Roy Marples <uberlord@gentoo.org>:
+
+ New variable RC_ULIMIT applies ulimit commands before starting a service.
+ This should be configured in /etc/conf.d/foo for service foo, but can also
+ be configured in /etc/conf.d/rc on a global basis.
+ RC_DAEMON now works in a similar way, instead of RC_DAEMON_foo.
+ Fixes, #120151.
+
+ 24 Jan 2006; Roy Marples <uberlord@gentoo.org>:
+
+ Dependant services are restarted correctly when the restarted
+ service is started and not inactive, #120154.
+
+ 21 Jan 2006; Roy Marples <uberlord@gentoo.org>:
+
+ Ensure that CRITICAL_SERVICES are in the boot runlevel, #117912.
+
+* baselayout-1.12.0_pre15 (20 Jan 2006)
+
+ 20 Jan 2006; Roy Marples <uberlord@gentoo.org>:
+
+ Fix quoting in iwconfig, #119629.
+ Fix process pid selection in rc-daemon.sh, #119631.
+ Both of the above thanks to Dominik Buerkle.
+
+ init scripts no longer run during the sysinit runlevel, #118419.
+ Thanks to Greg KH and the Linux Hotplug mailing list for advice.
+
+ 19 Jan 2006; Roy Marples <uberlord@gentoo.org>:
+
+ Give a better error message when no valid DHCP client is installed.
+
18 Jan 2006; Roy Marples <uberlord@gentoo.org>:
- Services should not get stuck in rc anymore, #119242.
+ Services should not get stuck in rc anymore, #119233, #119242.
We only hotplug net.* scripts on interfaces that are marked as ethernet.
@@ -17,11 +65,6 @@
Interfaces names with a dot in them now work.
- 15 Jan 2005; Roy Marples <uberlord@gentoo.org>:
-
- Changed wording about network modules in /etc/modules.autoload.d/*,
- #118419.
-
14 Jan 2006; Roy Marples <uberlord@gentoo.org>:
Changed runscript.sh to store it's services to restart like rc.
diff --git a/ChangeLog.vserver b/ChangeLog.vserver
index dc6863e..2a752fd 100644
--- a/ChangeLog.vserver
+++ b/ChangeLog.vserver
@@ -1,724 +1,741 @@
# ChangeLog for Gentoo System Intialization ("rc") scripts
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPLv2
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPLv2
+
+ 06 Feb 2006; Christian Heim <phreak@gentoo.org>:
+ Importing latest baselayout/trunk changes. This merge is based upon
+ revision 1851.
+
+ ChangeLog | 55 ++++++++++++++--
+ ChangeLog.vserver | 21 +++++-
+ etc/conf.d/rc | 21 ++++--
+ etc/services | 2
+ net-scripts/net.modules.d/ifconfig | 1
+ net-scripts/net.modules.d/iwconfig | 14 ++--
+ sbin/init-common-post.sh | 6 +
+ sbin/rc | 18 +++++
+ sbin/rc-daemon.sh | 9 +-
+ sbin/runscript.sh | 46 ++++++++++----
+ src/consoletype.c | 59 +++++++++++++-----
+ 11 files changed, 199 insertions(+), 53 deletions(-)
19 Jan 2006; Christian Heim <phreak@gentoo.org>:
Importing latest baselayout/trunk changes. This merge is based upon
revision 1832.
- ChangeLog | 10
- ChangeLog.vserver | 14 +
- net-scripts/init.d/net.lo | 29 +-
- net-scripts/net.modules.d/ifconfig | 8
- net-scripts/net.modules.d/iproute2 | 9
- sbin/depscan.sh | 6
- sbin/rc-services.sh | 47 ++--
- sbin/runscript.sh | 203 +++++++-----------
- 8 files changed, 173 insertions(+), 153 deletions(-)
+ ChangeLog | 10
+ ChangeLog.vserver | 14 +
+ net-scripts/init.d/net.lo | 29 +-
+ net-scripts/net.modules.d/ifconfig | 8
+ net-scripts/net.modules.d/iproute2 | 9
+ sbin/depscan.sh | 6
+ sbin/rc-services.sh | 47 ++--
+ sbin/runscript.sh | 203 +++++++-----------
+ 8 files changed, 173 insertions(+), 153 deletions(-)
17 Jan 2006; Christian Heim <phreak@gentoo.org>:
Importing latest baselayout/trunk changes. This merge is based upon
revision 1828.
- ChangeLog | 13 +++
- ChangeLog.vserver | 18 ++++-
- net-scripts/init.d/net.lo | 9 +-
- sbin/depscan.sh | 2
- sbin/rc-services.sh | 16 +++-
- sbin/runscript.sh | 59 +++++++++---------
- 6 files changed, 73 insertions(+), 44 deletions(-)
+ ChangeLog | 13 +++
+ ChangeLog.vserver | 18 ++++-
+ net-scripts/init.d/net.lo | 9 +-
+ sbin/depscan.sh | 2
+ sbin/rc-services.sh | 16 +++-
+ sbin/runscript.sh | 59 +++++++++---------
+ 6 files changed, 73 insertions(+), 44 deletions(-)
15 Jan 2006; Christian Heim <phreak@gentoo.org>:
Importing latest baselayout/trunk changes. This merge is based upon
revision 1822.
- ChangeLog | 29 ++
- ChangeLog.vserver | 21 +
- bin/rc-status | 3
- net-scripts/init.d/net.lo | 9
- net-scripts/net.modules.d/bonding | 4
- net-scripts/net.modules.d/bridge | 4
- net-scripts/net.modules.d/helpers.d/functions | 6
- net-scripts/net.modules.d/ifconfig | 7
- net-scripts/net.modules.d/iproute2 | 5
- sbin/functions.sh | 2
- sbin/init.linux.sh | 2
- sbin/rc | 47 +--
- sbin/rc-daemon.sh | 26 -
- sbin/rc-services.sh | 27 -
- sbin/runscript.sh | 258 ++++++++++--------
- 15 files changed, 269 insertions(+), 181 deletions(-)
+ ChangeLog | 29 ++
+ ChangeLog.vserver | 21 +
+ bin/rc-status | 3
+ net-scripts/init.d/net.lo | 9
+ net-scripts/net.modules.d/bonding | 4
+ net-scripts/net.modules.d/bridge | 4
+ net-scripts/net.modules.d/helpers.d/functions | 6
+ net-scripts/net.modules.d/ifconfig | 7
+ net-scripts/net.modules.d/iproute2 | 5
+ sbin/functions.sh | 2
+ sbin/init.linux.sh | 2
+ sbin/rc | 47 +--
+ sbin/rc-daemon.sh | 26 -
+ sbin/rc-services.sh | 27 -
+ sbin/runscript.sh | 258 ++++++++++--------
+ 15 files changed, 269 insertions(+), 181 deletions(-)
11 Jan 2006; Christian Heim <phreak@gentoo.org>:
Importing latest baselayout/trunk changes. This merge is based upon
revision 1802.
- ChangeLog | 10 +
- ChangeLog.vserver | 14 +
- etc/conf.d/rc | 14 -
- net-scripts/init.d/net.lo | 2
- net-scripts/net.modules.d/bonding | 16 +-
- sbin/rc-daemon.sh | 9 +
- sbin/rc-services.sh | 6
- sbin/runscript.sh | 133 ++++++++++++------
- 8 files changed, 151 insertions(+), 53 deletions(-)
+ ChangeLog | 10 +
+ ChangeLog.vserver | 14 +
+ etc/conf.d/rc | 14 -
+ net-scripts/init.d/net.lo | 2
+ net-scripts/net.modules.d/bonding | 16 +-
+ sbin/rc-daemon.sh | 9 +
+ sbin/rc-services.sh | 6
+ sbin/runscript.sh | 133 ++++++++++++------
+ 8 files changed, 151 insertions(+), 53 deletions(-)
10 Jan 2006; Christian Heim <phreak@gentoo.org>:
Importing latest baselayout/trunk changes. This merge is based upon
revision 1799.
- ChangeLog | 131 ++++++--
- ChangeLog.vserver | 58 +++
- etc/conf.d/domainname | 4
- etc/profile | 14
- init.d/bootmisc | 2
- init.d/domainname | 4
- init.d/dummy | 2
- init.d/halt.sh | 2
- init.d/hostname | 2
- init.d/local | 2
- init.d/reboot.sh | 2
- init.d/rmnologin | 2
- init.d/shutdown.sh | 2
- net-scripts/conf.d/net.example | 4
- net-scripts/conf.d/wireless.example | 15
- net-scripts/init.d/net.lo | 14
- net-scripts/net.modules.d/adsl | 2
- net-scripts/net.modules.d/apipa | 2
- net-scripts/net.modules.d/arping | 2
- net-scripts/net.modules.d/bonding | 10
- net-scripts/net.modules.d/bridge | 10
- net-scripts/net.modules.d/dhclient | 2
- net-scripts/net.modules.d/dhcpcd | 2
- net-scripts/net.modules.d/essidnet | 4
- net-scripts/net.modules.d/helpers.d/dhclient-wrapper | 5
- net-scripts/net.modules.d/helpers.d/dhcp | 2
- net-scripts/net.modules.d/helpers.d/dhcp-state | 2
- net-scripts/net.modules.d/helpers.d/dhcpcd-wrapper | 2
- net-scripts/net.modules.d/helpers.d/functions | 4
- net-scripts/net.modules.d/helpers.d/module-loader | 6
- net-scripts/net.modules.d/helpers.d/pppd-wrapper | 2
- net-scripts/net.modules.d/helpers.d/pump-wrapper | 2
- net-scripts/net.modules.d/helpers.d/udhcpc-wrapper | 2
- net-scripts/net.modules.d/iproute2 | 1
- net-scripts/net.modules.d/iwconfig | 48 +--
- net-scripts/net.modules.d/wpa_supplicant | 14
- sbin/MAKEDEV | 3
- sbin/depscan.sh | 4
- sbin/functions.sh | 29 -
- sbin/init-common-post.sh | 2
- sbin/init-common-pre.sh | 2
- sbin/init-functions.sh | 19 -
- sbin/init.linux.sh | 8
- sbin/rc | 7
- sbin/rc-daemon.sh | 12
- sbin/rc-help.sh | 4
- sbin/rc-services.sh | 50 +--
- sbin/rc-update | 2
- sbin/runscript.sh | 280 ++++++++----------
- src/Makefile | 2
- src/awk/genenviron.awk | 2
- src/core/ChangeLog.0 | 2
- 52 files changed, 479 insertions(+), 333 deletions(-)
+ ChangeLog | 131 ++++++--
+ ChangeLog.vserver | 58 +++
+ etc/conf.d/domainname | 4
+ etc/profile | 14
+ init.d/bootmisc | 2
+ init.d/domainname | 4
+ init.d/dummy | 2
+ init.d/halt.sh | 2
+ init.d/hostname | 2
+ init.d/local | 2
+ init.d/reboot.sh | 2
+ init.d/rmnologin | 2
+ init.d/shutdown.sh | 2
+ net-scripts/conf.d/net.example | 4
+ net-scripts/conf.d/wireless.example | 15
+ net-scripts/init.d/net.lo | 14
+ net-scripts/net.modules.d/adsl | 2
+ net-scripts/net.modules.d/apipa | 2
+ net-scripts/net.modules.d/arping | 2
+ net-scripts/net.modules.d/bonding | 10
+ net-scripts/net.modules.d/bridge | 10
+ net-scripts/net.modules.d/dhclient | 2
+ net-scripts/net.modules.d/dhcpcd | 2
+ net-scripts/net.modules.d/essidnet | 4
+ net-scripts/net.modules.d/helpers.d/dhclient-wrapper | 5
+ net-scripts/net.modules.d/helpers.d/dhcp | 2
+ net-scripts/net.modules.d/helpers.d/dhcp-state | 2
+ net-scripts/net.modules.d/helpers.d/dhcpcd-wrapper | 2
+ net-scripts/net.modules.d/helpers.d/functions | 4
+ net-scripts/net.modules.d/helpers.d/module-loader | 6
+ net-scripts/net.modules.d/helpers.d/pppd-wrapper | 2
+ net-scripts/net.modules.d/helpers.d/pump-wrapper | 2
+ net-scripts/net.modules.d/helpers.d/udhcpc-wrapper | 2
+ net-scripts/net.modules.d/iproute2 | 1
+ net-scripts/net.modules.d/iwconfig | 48 +--
+ net-scripts/net.modules.d/wpa_supplicant | 14
+ sbin/MAKEDEV | 3
+ sbin/depscan.sh | 4
+ sbin/functions.sh | 29 -
+ sbin/init-common-post.sh | 2
+ sbin/init-common-pre.sh | 2
+ sbin/init-functions.sh | 19 -
+ sbin/init.linux.sh | 8
+ sbin/rc | 7
+ sbin/rc-daemon.sh | 12
+ sbin/rc-help.sh | 4
+ sbin/rc-services.sh | 50 +--
+ sbin/rc-update | 2
+ sbin/runscript.sh | 280 ++++++++----------
+ src/Makefile | 2
+ src/awk/genenviron.awk | 2
+ src/core/ChangeLog.0 | 2
+ 52 files changed, 479 insertions(+), 333 deletions(-)
22 Dec 2005; Christian Heim <phreak@gentoo.org>:
Importing latest baselayout/trunk changes. This is a merge with
revision 1768.
- ChangeLog | 26 ++++++
- ChangeLog.vserver | 22 +++++
- etc/conf.d/rc | 6 +
- etc/profile | 14 +--
- net-scripts/conf.d/net.example | 46 +++++++----
- net-scripts/init.d/net.lo | 9 +-
- net-scripts/net.modules.d/dhclient | 7 -
- net-scripts/net.modules.d/dhcpcd | 3
- net-scripts/net.modules.d/helpers.d/dhcp | 13 ---
- net-scripts/net.modules.d/helpers.d/dhcp-state | 2
- net-scripts/net.modules.d/iwconfig | 50 +++---------
- net-scripts/net.modules.d/udhcpc | 3
- sbin/functions.sh | 1
- src/core/librcscripts/api/misc.h | 1
- src/core/librcscripts/misc.c | 74 ++++++++++++++++--
- src/core/src/runscript.c | 66 ----------------
- 16 files changed, 189 insertions(+), 153 deletions(-)
+ ChangeLog | 26 ++++++
+ ChangeLog.vserver | 22 +++++
+ etc/conf.d/rc | 6 +
+ etc/profile | 14 +--
+ net-scripts/conf.d/net.example | 46 +++++++----
+ net-scripts/init.d/net.lo | 9 +-
+ net-scripts/net.modules.d/dhclient | 7 -
+ net-scripts/net.modules.d/dhcpcd | 3
+ net-scripts/net.modules.d/helpers.d/dhcp | 13 ---
+ net-scripts/net.modules.d/helpers.d/dhcp-state | 2
+ net-scripts/net.modules.d/iwconfig | 50 +++---------
+ net-scripts/net.modules.d/udhcpc | 3
+ sbin/functions.sh | 1
+ src/core/librcscripts/api/misc.h | 1
+ src/core/librcscripts/misc.c | 74 ++++++++++++++++--
+ src/core/src/runscript.c | 66 ----------------
+ 16 files changed, 189 insertions(+), 153 deletions(-)
09 Dec 2005; Christian Heim <phreak@gentoo.org>:
Importing latest baselayout/trunk changes. This is a merge with
revision 1753.
- ChangeLog | 5 ++++
- ChangeLog.vserver | 16 ++++++++++++
- net-scripts/init.d/net.lo | 9 -------
- net-scripts/net.modules.d/dhclient | 8 ------
- net-scripts/net.modules.d/dhcpcd | 7 ------
- net-scripts/net.modules.d/helpers.d/dhcp-state | 4 ---
- net-scripts/net.modules.d/iwconfig | 11 ---------
- net-scripts/net.modules.d/pump | 7 ------
- net-scripts/net.modules.d/udhcpc | 7 ------
- net-scripts/net.modules.d/wpa_supplicant | 21 +++---------------
- 10 files changed, 26 insertions(+), 69 deletions(-)
+ ChangeLog | 5 ++++
+ ChangeLog.vserver | 16 ++++++++++++
+ net-scripts/init.d/net.lo | 9 -------
+ net-scripts/net.modules.d/dhclient | 8 ------
+ net-scripts/net.modules.d/dhcpcd | 7 ------
+ net-scripts/net.modules.d/helpers.d/dhcp-state | 4 ---
+ net-scripts/net.modules.d/iwconfig | 11 ---------
+ net-scripts/net.modules.d/pump | 7 ------
+ net-scripts/net.modules.d/udhcpc | 7 ------
+ net-scripts/net.modules.d/wpa_supplicant | 21 +++---------------
+ 10 files changed, 26 insertions(+), 69 deletions(-)
09 Dec 2005; Christian Heim <phreak@gentoo.org>:
Importing latest baselayout/trunk changes. This is a merge with
revision 1752.
- ChangeLog | 10 +
- ChangeLog.vserver | 20 ++
- sbin/functions.sh | 36 ++-
- src/core/librcscripts/api/debug.h | 10 -
- src/core/librcscripts/api/dynbuf.h | 15 -
- src/core/librcscripts/api/parse.h | 6
- src/core/librcscripts/api/runlevels.h | 2
- src/core/librcscripts/depend.c | 18 -
- src/core/librcscripts/dynbuf.c | 105 +++++++++-
- src/core/librcscripts/misc.c | 86 +++-----
- src/core/librcscripts/parse.c | 177 ++++++++----------
- src/core/librcscripts/runlevels.c | 2
- src/core/librcscripts/scripts.c | 32 +--
- src/core/librcscripts/simple-regex.c | 38 +--
- 14 files changed, 326 insertions(+), 231 deletions(-)
+ ChangeLog | 10 +
+ ChangeLog.vserver | 20 ++
+ sbin/functions.sh | 36 ++-
+ src/core/librcscripts/api/debug.h | 10 -
+ src/core/librcscripts/api/dynbuf.h | 15 -
+ src/core/librcscripts/api/parse.h | 6
+ src/core/librcscripts/api/runlevels.h | 2
+ src/core/librcscripts/depend.c | 18 -
+ src/core/librcscripts/dynbuf.c | 105 +++++++++-
+ src/core/librcscripts/misc.c | 86 +++-----
+ src/core/librcscripts/parse.c | 177 ++++++++----------
+ src/core/librcscripts/runlevels.c | 2
+ src/core/librcscripts/scripts.c | 32 +--
+ src/core/librcscripts/simple-regex.c | 38 +--
+ 14 files changed, 326 insertions(+), 231 deletions(-)
06 Dec 2005; Christian Heim <phreak@gentoo.org>:
Importing latest baselayout/trunk changes. Merging revision 1733.
- ChangeLog | 8
- ChangeLog.vserver | 50
- net-scripts/conf.d/net.example | 5
- net-scripts/net.modules.d/dhclient | 10
- net-scripts/net.modules.d/dhcpcd | 18
- net-scripts/net.modules.d/helpers.d/dhcp | 11
- net-scripts/net.modules.d/helpers.d/dhcpcd-wrapper | 4
- net-scripts/net.modules.d/pump | 9
- net-scripts/net.modules.d/udhcpc | 8
- src/core/Makefile.am | 4
- src/core/configure.ac | 55
- src/core/librcscripts/Makefile.am | 31
- src/core/librcscripts/api/debug.h | 136 +
- src/core/librcscripts/api/depend.h | 76
- src/core/librcscripts/api/dynbuf.h | 63
- src/core/librcscripts/api/list.h | 446 +++++
- src/core/librcscripts/api/misc.h | 106 +
- src/core/librcscripts/api/parse.h | 84 +
- src/core/librcscripts/api/rctypes.h | 43
- src/core/librcscripts/api/runlevels.h | 44
- src/core/librcscripts/api/scripts.h | 43
- src/core/librcscripts/api/simple-regex.h | 87 +
- src/core/librcscripts/api/str_list.h | 212 ++
- src/core/librcscripts/debug.c | 297 +++
- src/core/librcscripts/debug.h | 85 -
- src/core/librcscripts/depend.c | 973 ++++++------
- src/core/librcscripts/depend.h | 75
- src/core/librcscripts/dynbuf.c | 332 ++++
- src/core/librcscripts/list.h | 446 -----
- src/core/librcscripts/misc.c | 916 +++++------
- src/core/librcscripts/misc.h | 282 ---
- src/core/librcscripts/parse.c | 1439 ++++++++----------
- src/core/librcscripts/parse.h | 100 -
- src/core/librcscripts/rcscripts.h | 26
- src/core/librcscripts/runlevels.c | 218 ++
- src/core/librcscripts/scripts.c | 256 +++
- src/core/librcscripts/simple-regex.c | 1232 +++++++--------
- src/core/librcscripts/simple-regex.h | 86 -
- src/core/src/depscan.c | 433 ++---
- src/core/src/runscript.c | 381 ++--
- src/core/tests/Makefile.am | 25
- src/core/tests/test-dynbuf.c | 139 +
- src/core/tests/test-mmap.c | 46
- src/core/tests/test-regex.c | 97 -
- src/core/tests/test-runlevels.c | 70
- 45 files changed, 5687 insertions(+), 3820 deletions(-)
+ ChangeLog | 8
+ ChangeLog.vserver | 50
+ net-scripts/conf.d/net.example | 5
+ net-scripts/net.modules.d/dhclient | 10
+ net-scripts/net.modules.d/dhcpcd | 18
+ net-scripts/net.modules.d/helpers.d/dhcp | 11
+ net-scripts/net.modules.d/helpers.d/dhcpcd-wrapper | 4
+ net-scripts/net.modules.d/pump | 9
+ net-scripts/net.modules.d/udhcpc | 8
+ src/core/Makefile.am | 4
+ src/core/configure.ac | 55
+ src/core/librcscripts/Makefile.am | 31
+ src/core/librcscripts/api/debug.h | 136 +
+ src/core/librcscripts/api/depend.h | 76
+ src/core/librcscripts/api/dynbuf.h | 63
+ src/core/librcscripts/api/list.h | 446 +++++
+ src/core/librcscripts/api/misc.h | 106 +
+ src/core/librcscripts/api/parse.h | 84 +
+ src/core/librcscripts/api/rctypes.h | 43
+ src/core/librcscripts/api/runlevels.h | 44
+ src/core/librcscripts/api/scripts.h | 43
+ src/core/librcscripts/api/simple-regex.h | 87 +
+ src/core/librcscripts/api/str_list.h | 212 ++
+ src/core/librcscripts/debug.c | 297 +++
+ src/core/librcscripts/debug.h | 85 -
+ src/core/librcscripts/depend.c | 973 ++++++------
+ src/core/librcscripts/depend.h | 75
+ src/core/librcscripts/dynbuf.c | 332 ++++
+ src/core/librcscripts/list.h | 446 -----
+ src/core/librcscripts/misc.c | 916 +++++------
+ src/core/librcscripts/misc.h | 282 ---
+ src/core/librcscripts/parse.c | 1439 ++++++++----------
+ src/core/librcscripts/parse.h | 100 -
+ src/core/librcscripts/rcscripts.h | 26
+ src/core/librcscripts/runlevels.c | 218 ++
+ src/core/librcscripts/scripts.c | 256 +++
+ src/core/librcscripts/simple-regex.c | 1232 +++++++--------
+ src/core/librcscripts/simple-regex.h | 86 -
+ src/core/src/depscan.c | 433 ++---
+ src/core/src/runscript.c | 381 ++--
+ src/core/tests/Makefile.am | 25
+ src/core/tests/test-dynbuf.c | 139 +
+ src/core/tests/test-mmap.c | 46
+ src/core/tests/test-regex.c | 97 -
+ src/core/tests/test-runlevels.c | 70
+ 45 files changed, 5687 insertions(+), 3820 deletions(-)
02 Dec 2005; Christian Heim <phreak@gentoo.org>:
Import the latest baselayout changes. Merging revision 1658.
- ChangeLog.vserver | 49
- sbin/rc-services.sh | 30
- src/core/COPYING | 340 ++++++
- src/core/ChangeLog | 234 ----
- src/core/ChangeLog.0 | 234 ++++
- src/core/INSTALL | 236 ++++
- src/core/Makefile | 83 -
- src/core/Makefile.am | 10
- src/core/autogen.sh | 16
- src/core/configure.ac | 66 +
- src/core/data/Makefile.am | 4
- src/core/data/env_whitelist | 30
- src/core/debug.h | 85 -
- src/core/depend.c | 557 ----------
- src/core/depend.h | 75 -
- src/core/depscan.c | 297 -----
- src/core/librcscripts/Makefile.am | 18
- src/core/librcscripts/debug.h | 85 +
- src/core/librcscripts/depend.c | 557 ++++++++++
- src/core/librcscripts/depend.h | 75 +
- src/core/librcscripts/list.h | 446 ++++++++
- src/core/librcscripts/misc.c | 659 ++++++++++++
- src/core/librcscripts/misc.h | 282 +++++
- src/core/librcscripts/parse.c | 982 ++++++++++++++++++
- src/core/librcscripts/parse.h | 100 +
- src/core/librcscripts/rcscripts.h | 54
- src/core/librcscripts/simple-regex.c | 827 +++++++++++++++
- src/core/librcscripts/simple-regex.h | 86 +
- src/core/list.h | 446 --------
- src/core/misc.c | 659 ------------
- src/core/misc.h | 282 -----
- src/core/parse.c | 981 -----------------
- src/core/parse.h | 109 -
- src/core/scripts/Makefile.am | 3
- src/core/scripts/clean.sh | 17
- src/core/scripts/svn2cl.sh | 130 ++
- src/core/scripts/svn2cl.xsl | 295 +++++
- src/core/simple-regex.c | 827 ---------------
- src/core/simple-regex.h | 86 -
- src/core/src/Makefile.am | 17
- src/core/src/depscan.c | 298 +++++
- src/core/src/runscript.c | 237 ++++
- src/core/test-regex.c | 80 -
- src/core/tests/Makefile.am | 1
- src/core/tests/test-regex.c | 80 +
- 45 files changed, 6253 insertions(+), 4813 deletions(-)
+ ChangeLog.vserver | 49
+ sbin/rc-services.sh | 30
+ src/core/COPYING | 340 ++++++
+ src/core/ChangeLog | 234 ----
+ src/core/ChangeLog.0 | 234 ++++
+ src/core/INSTALL | 236 ++++
+ src/core/Makefile | 83 -
+ src/core/Makefile.am | 10
+ src/core/autogen.sh | 16
+ src/core/configure.ac | 66 +
+ src/core/data/Makefile.am | 4
+ src/core/data/env_whitelist | 30
+ src/core/debug.h | 85 -
+ src/core/depend.c | 557 ----------
+ src/core/depend.h | 75 -
+ src/core/depscan.c | 297 -----
+ src/core/librcscripts/Makefile.am | 18
+ src/core/librcscripts/debug.h | 85 +
+ src/core/librcscripts/depend.c | 557 ++++++++++
+ src/core/librcscripts/depend.h | 75 +
+ src/core/librcscripts/list.h | 446 ++++++++
+ src/core/librcscripts/misc.c | 659 ++++++++++++
+ src/core/librcscripts/misc.h | 282 +++++
+ src/core/librcscripts/parse.c | 982 ++++++++++++++++++
+ src/core/librcscripts/parse.h | 100 +
+ src/core/librcscripts/rcscripts.h | 54
+ src/core/librcscripts/simple-regex.c | 827 +++++++++++++++
+ src/core/librcscripts/simple-regex.h | 86 +
+ src/core/list.h | 446 --------
+ src/core/misc.c | 659 ------------
+ src/core/misc.h | 282 -----
+ src/core/parse.c | 981 -----------------
+ src/core/parse.h | 109 -
+ src/core/scripts/Makefile.am | 3
+ src/core/scripts/clean.sh | 17
+ src/core/scripts/svn2cl.sh | 130 ++
+ src/core/scripts/svn2cl.xsl | 295 +++++
+ src/core/simple-regex.c | 827 ---------------
+ src/core/simple-regex.h | 86 -
+ src/core/src/Makefile.am | 17
+ src/core/src/depscan.c | 298 +++++
+ src/core/src/runscript.c | 237 ++++
+ src/core/test-regex.c | 80 -
+ src/core/tests/Makefile.am | 1
+ src/core/tests/test-regex.c | 80 +
+ 45 files changed, 6253 insertions(+), 4813 deletions(-)
30 Nov 2005; Christian Heim <phreak@gentoo.org>:
Import the latest baselayout changes. Merging revision 1648.
- ChangeLog | 8 ++++
- ChangeLog.vserver | 16 ++++++++
- STYLE | 13 ++++++
- etc/conf.d/rc | 6 +++
- init.d/bootmisc | 14 +++----
- init.d/domainname | 14 +++----
- init.d/hostname | 6 +--
- init.d/local | 8 ++--
- po/Makefile | 36 ++++++++++++++++++
- sbin/functions.sh | 4 ++
- sbin/runscript.sh | 5 ++
- 11 files changed, 109 insertions(+), 21 deletions(-)
+ ChangeLog | 8 ++++
+ ChangeLog.vserver | 16 ++++++++
+ STYLE | 13 ++++++
+ etc/conf.d/rc | 6 +++
+ init.d/bootmisc | 14 +++----
+ init.d/domainname | 14 +++----
+ init.d/hostname | 6 +--
+ init.d/local | 8 ++--
+ po/Makefile | 36 ++++++++++++++++++
+ sbin/functions.sh | 4 ++
+ sbin/runscript.sh | 5 ++
+ 11 files changed, 109 insertions(+), 21 deletions(-)
28 Nov 2005; Christian Heim <phreak@gentoo.org>:
Import the latest baselayout changes. Merging revision 1634.
- ChangeLog | 13 +++++++++++++
- ChangeLog.vserver | 14 ++++++++++++++
- bin/rc-status | 8 ++++++++
- net-scripts/init.d/net.lo | 2 +-
- net-scripts/net.modules.d/dhcpcd | 2 +-
- net-scripts/net.modules.d/helpers.d/functions | 2 +-
- net-scripts/net.modules.d/iproute2 | 2 +-
- net-scripts/net.modules.d/iwconfig | 4 ++--
- net-scripts/net.modules.d/pump | 2 +-
- 9 files changed, 42 insertions(+), 7 deletions(-)
+ ChangeLog | 13 +++++++++++++
+ ChangeLog.vserver | 14 ++++++++++++++
+ bin/rc-status | 8 ++++++++
+ net-scripts/init.d/net.lo | 2 +-
+ net-scripts/net.modules.d/dhcpcd | 2 +-
+ net-scripts/net.modules.d/helpers.d/functions | 2 +-
+ net-scripts/net.modules.d/iproute2 | 2 +-
+ net-scripts/net.modules.d/iwconfig | 4 ++--
+ net-scripts/net.modules.d/pump | 2 +-
+ 9 files changed, 42 insertions(+), 7 deletions(-)
24 Nov 2005; Christian Heim <phreak@gentoo.org>:
Import latest fixup for the _pre11 release (fixing several bugs). Merging
revision 1629.
- ChangeLog | 11 +++++++++++
- ChangeLog.vserver | 23 ++++++++++++++++++
- net-scripts/conf.d/net.example | 2 +-
- net-scripts/init.d/net.lo | 2 +-
- net-scripts/net.modules.d/arping | 4 ++--
- net-scripts/net.modules.d/dhcpcd | 2 +-
- net-scripts/net.modules.d/helpers.d/dhclient-wrapper | 3 ++-
- net-scripts/net.modules.d/helpers.d/dhcp | 3 ++-
- net-scripts/net.modules.d/helpers.d/dhcp-state | 5 ++---
- net-scripts/net.modules.d/helpers.d/dhcpcd-wrapper | 5 +++--
- net-scripts/net.modules.d/helpers.d/functions | 2 +-
- net-scripts/net.modules.d/helpers.d/module-loader | 6 ++++--
- net-scripts/net.modules.d/helpers.d/pppd-wrapper | 3 ++-
- net-scripts/net.modules.d/helpers.d/pump-wrapper | 6 ++++--
- net-scripts/net.modules.d/helpers.d/udhcpc-wrapper | 3 ++-
- net-scripts/net.modules.d/ifconfig | 4 ++--
- net-scripts/net.modules.d/pppd | 8 ++++----
- net-scripts/net.modules.d/pump | 2 +-
- 18 files changed, 68 insertions(+), 26 deletions(-)
+ ChangeLog | 11 +++++++++++
+ ChangeLog.vserver | 23 ++++++++++++++++++
+ net-scripts/conf.d/net.example | 2 +-
+ net-scripts/init.d/net.lo | 2 +-
+ net-scripts/net.modules.d/arping | 4 ++--
+ net-scripts/net.modules.d/dhcpcd | 2 +-
+ net-scripts/net.modules.d/helpers.d/dhclient-wrapper | 3 ++-
+ net-scripts/net.modules.d/helpers.d/dhcp | 3 ++-
+ net-scripts/net.modules.d/helpers.d/dhcp-state | 5 ++---
+ net-scripts/net.modules.d/helpers.d/dhcpcd-wrapper | 5 +++--
+ net-scripts/net.modules.d/helpers.d/functions | 2 +-
+ net-scripts/net.modules.d/helpers.d/module-loader | 6 ++++--
+ net-scripts/net.modules.d/helpers.d/pppd-wrapper | 3 ++-
+ net-scripts/net.modules.d/helpers.d/pump-wrapper | 6 ++++--
+ net-scripts/net.modules.d/helpers.d/udhcpc-wrapper | 3 ++-
+ net-scripts/net.modules.d/ifconfig | 4 ++--
+ net-scripts/net.modules.d/pppd | 8 ++++----
+ net-scripts/net.modules.d/pump | 2 +-
+ 18 files changed, 68 insertions(+), 26 deletions(-)
23 Nov 2005; Christian Heim <phreak@gentoo.org>:
baselayout folks just did a _pre11 so I'm syncing again (to 1626 this time).
- ChangeLog | 10 +++++
- ChangeLog.vserver | 11 ++++++
- etc/conf.d/rc | 7 ++-
- net-scripts/conf.d/net.example | 8 ++++
- net-scripts/net.modules.d/macchanger | 32 +++++++++---------
- 5 files changed, 50 insertions(+), 18 deletions(-)
+ ChangeLog | 10 +++++
+ ChangeLog.vserver | 11 ++++++
+ etc/conf.d/rc | 7 ++-
+ net-scripts/conf.d/net.example | 8 ++++
+ net-scripts/net.modules.d/macchanger | 32 +++++++++---------
+ 5 files changed, 50 insertions(+), 18 deletions(-)
22 Nov 2005; Christian Heim <phreak@gentoo.org>:
Uberlord did a commit right after my, so i'm syncing it again;
but this time to r1622.
- ChangeLog | 4 ++
- ChangeLog.vserver | 15 +++++++++
- net-scripts/net.modules.d/bonding | 13 ++++++-
- net-scripts/net.modules.d/essidnet | 5 +--
- net-scripts/net.modules.d/ifplugd | 26 ++++++---------
- net-scripts/net.modules.d/iwconfig | 6 +--
- net-scripts/net.modules.d/netplugd | 30 ++++--------------
- net-scripts/net.modules.d/vlan | 10 +++++-
- net-scripts/net.modules.d/wpa_supplicant | 12 +++----
- 9 files changed, 67 insertions(+), 54 deletions(-)
+ ChangeLog | 4 ++
+ ChangeLog.vserver | 15 +++++++++
+ net-scripts/net.modules.d/bonding | 13 ++++++-
+ net-scripts/net.modules.d/essidnet | 5 +--
+ net-scripts/net.modules.d/ifplugd | 26 ++++++---------
+ net-scripts/net.modules.d/iwconfig | 6 +--
+ net-scripts/net.modules.d/netplugd | 30 ++++--------------
+ net-scripts/net.modules.d/vlan | 10 +++++-
+ net-scripts/net.modules.d/wpa_supplicant | 12 +++----
+ 9 files changed, 67 insertions(+), 54 deletions(-)
22 Nov 2005; Christian Heim <phreak@gentoo.org>:
Merging latest changes from baselayout (r1621).
- ChangeLog | 22 -
- ChangeLog.vserver | 40 +
- etc/profile | 7
- net-scripts/init.d/net.lo | 35 -
- net-scripts/net.modules.d/adsl | 4
- net-scripts/net.modules.d/arping | 20
- net-scripts/net.modules.d/bonding | 15
- net-scripts/net.modules.d/bridge | 31 -
- net-scripts/net.modules.d/dhclient | 36 -
- net-scripts/net.modules.d/dhcpcd | 33 -
- net-scripts/net.modules.d/essidnet | 4
- net-scripts/net.modules.d/helpers.d/dhclient-wrapper | 2
- net-scripts/net.modules.d/helpers.d/dhcp | 22 -
- net-scripts/net.modules.d/helpers.d/dhcpcd-wrapper | 18
- net-scripts/net.modules.d/helpers.d/functions | 30 -
- net-scripts/net.modules.d/helpers.d/pppd-wrapper | 43 +
- net-scripts/net.modules.d/helpers.d/pump-wrapper | 9
- net-scripts/net.modules.d/ifconfig | 63 ++
- net-scripts/net.modules.d/ifplugd | 12
- net-scripts/net.modules.d/ipppd | 22 -
- net-scripts/net.modules.d/iproute2 | 68 +--
- net-scripts/net.modules.d/iptunnel | 6
- net-scripts/net.modules.d/iwconfig | 123 +++--
- net-scripts/net.modules.d/macchanger | 6
- net-scripts/net.modules.d/macnet | 2
- net-scripts/net.modules.d/netplugd | 3
- net-scripts/net.modules.d/pppd | 394 +++++++++---------
- net-scripts/net.modules.d/pump | 32 -
- net-scripts/net.modules.d/rename | 18
- net-scripts/net.modules.d/system | 66 +--
- net-scripts/net.modules.d/tuntap | 4
- net-scripts/net.modules.d/udhcpc | 21
- net-scripts/net.modules.d/vlan | 19
- net-scripts/net.modules.d/wpa_supplicant | 14
- src/env_whitelist | 7
- 35 files changed, 719 insertions(+), 532 deletions(-)
+ ChangeLog | 22 -
+ ChangeLog.vserver | 40 +
+ etc/profile | 7
+ net-scripts/init.d/net.lo | 35 -
+ net-scripts/net.modules.d/adsl | 4
+ net-scripts/net.modules.d/arping | 20
+ net-scripts/net.modules.d/bonding | 15
+ net-scripts/net.modules.d/bridge | 31 -
+ net-scripts/net.modules.d/dhclient | 36 -
+ net-scripts/net.modules.d/dhcpcd | 33 -
+ net-scripts/net.modules.d/essidnet | 4
+ net-scripts/net.modules.d/helpers.d/dhclient-wrapper | 2
+ net-scripts/net.modules.d/helpers.d/dhcp | 22 -
+ net-scripts/net.modules.d/helpers.d/dhcpcd-wrapper | 18
+ net-scripts/net.modules.d/helpers.d/functions | 30 -
+ net-scripts/net.modules.d/helpers.d/pppd-wrapper | 43 +
+ net-scripts/net.modules.d/helpers.d/pump-wrapper | 9
+ net-scripts/net.modules.d/ifconfig | 63 ++
+ net-scripts/net.modules.d/ifplugd | 12
+ net-scripts/net.modules.d/ipppd | 22 -
+ net-scripts/net.modules.d/iproute2 | 68 +--
+ net-scripts/net.modules.d/iptunnel | 6
+ net-scripts/net.modules.d/iwconfig | 123 +++--
+ net-scripts/net.modules.d/macchanger | 6
+ net-scripts/net.modules.d/macnet | 2
+ net-scripts/net.modules.d/netplugd | 3
+ net-scripts/net.modules.d/pppd | 394 +++++++++---------
+ net-scripts/net.modules.d/pump | 32 -
+ net-scripts/net.modules.d/rename | 18
+ net-scripts/net.modules.d/system | 66 +--
+ net-scripts/net.modules.d/tuntap | 4
+ net-scripts/net.modules.d/udhcpc | 21
+ net-scripts/net.modules.d/vlan | 19
+ net-scripts/net.modules.d/wpa_supplicant | 14
+ src/env_whitelist | 7
+ 35 files changed, 719 insertions(+), 532 deletions(-)
10 Nov 2005; Christian Heim <phreak@gentoo.org>:
Merging uberlord's latest changes of baselayout (r1613).
- ChangeLog | 20 ++++++
- ChangeLog.vserver | 15 ++++
- net-scripts/conf.d/net.example | 59 +++++++++++-------
- net-scripts/init.d/net.lo | 4 -
- net-scripts/net.modules.d/ifplugd | 4 -
- net-scripts/net.modules.d/iwconfig | 1
- net-scripts/net.modules.d/netplugd | 4 -
- net-scripts/net.modules.d/pppd | 23 +++----
- net-scripts/net.modules.d/wpa_supplicant | 27 +++++---
- 9 files changed, 111 insertions(+), 46 deletions(-)
+ ChangeLog | 20 ++++++
+ ChangeLog.vserver | 15 ++++
+ net-scripts/conf.d/net.example | 59 +++++++++++-------
+ net-scripts/init.d/net.lo | 4 -
+ net-scripts/net.modules.d/ifplugd | 4 -
+ net-scripts/net.modules.d/iwconfig | 1
+ net-scripts/net.modules.d/netplugd | 4 -
+ net-scripts/net.modules.d/pppd | 23 +++----
+ net-scripts/net.modules.d/wpa_supplicant | 27 +++++---
+ 9 files changed, 111 insertions(+), 46 deletions(-)
08 Nov 2005; Christian Heim <phreak@gentoo.org>:
Merging uberlord's latest changes of baselayout (r1604).
- ChangeLog | 7 +
- ChangeLog.vserver | 10 ++
- bin/rc-status | 8 +-
- sbin/functions.sh | 25 +++---
- sbin/rc-services.sh | 70 +++++-------------
- 5 files changed, 57 insertions(+), 63 deletions(-)
+ ChangeLog | 7 +
+ ChangeLog.vserver | 10 ++
+ bin/rc-status | 8 +-
+ sbin/functions.sh | 25 +++---
+ sbin/rc-services.sh | 70 +++++-------------
+ 5 files changed, 57 insertions(+), 63 deletions(-)
07 Nov 2005; Christian Heim <phreak@gentoo.org>:
Merging uberlord's latest changes of baselayout (r1599).
- ChangeLog | 7
- ChangeLog.vserver | 10
- bin/rc-status | 20 +
- net-scripts/conf.d/net.example | 76 ++++++
- sbin/rc-services.sh | 211 +++++++-----------
- 5 files changed, 200 insertions(+), 124 deletions(-)
+ ChangeLog | 7
+ ChangeLog.vserver | 10
+ bin/rc-status | 20 +
+ net-scripts/conf.d/net.example | 76 ++++++
+ sbin/rc-services.sh | 211 +++++++-----------
+ 5 files changed, 200 insertions(+), 124 deletions(-)
05 Nov 2005; Christian Heim <phreak@gentoo.org>:
Merging changes between baselayout r1583 and r1596.
- ChangeLog | 57 +++
- ChangeLog.vserver | 41 ++
- bin/rc-status | 2
- etc/services | 249 +++++++++++++-
- init.d/domainname | 5
- init.d/hostname | 7
- net-scripts/init.d/net.lo | 303 +++++++++---------
- net-scripts/net.modules.d/adsl | 62 +--
- net-scripts/net.modules.d/apipa | 47 ++
- net-scripts/net.modules.d/arping | 100 +----
- net-scripts/net.modules.d/bonding | 35 --
- net-scripts/net.modules.d/bridge | 41 --
- net-scripts/net.modules.d/dhclient | 42 --
- net-scripts/net.modules.d/dhcpcd | 36 --
- net-scripts/net.modules.d/essidnet | 35 --
- net-scripts/net.modules.d/helpers.d/dhcp | 6
- net-scripts/net.modules.d/helpers.d/functions | 49 ++
- net-scripts/net.modules.d/helpers.d/module-loader | 26 +
- net-scripts/net.modules.d/ifconfig | 49 --
- net-scripts/net.modules.d/ifplugd | 38 --
- net-scripts/net.modules.d/ipppd | 26 -
- net-scripts/net.modules.d/iproute2 | 50 --
- net-scripts/net.modules.d/iptunnel | 42 --
- net-scripts/net.modules.d/iwconfig | 34 --
- net-scripts/net.modules.d/macchanger | 32 -
- net-scripts/net.modules.d/macnet | 35 --
- net-scripts/net.modules.d/netplugd | 36 --
- net-scripts/net.modules.d/pppd | 15
- net-scripts/net.modules.d/pump | 35 --
- net-scripts/net.modules.d/rename | 33 -
- net-scripts/net.modules.d/system | 37 --
- net-scripts/net.modules.d/tuntap | 34 --
- net-scripts/net.modules.d/udhcpc | 52 ---
- net-scripts/net.modules.d/vlan | 40 --
- net-scripts/net.modules.d/wpa_supplicant | 54 ---
- sbin/runscript.sh | 12
- src/core/parse.c | 2
- 37 files changed, 793 insertions(+), 1006 deletions(-)
+ ChangeLog | 57 +++
+ ChangeLog.vserver | 41 ++
+ bin/rc-status | 2
+ etc/services | 249 +++++++++++++-
+ init.d/domainname | 5
+ init.d/hostname | 7
+ net-scripts/init.d/net.lo | 303 +++++++++---------
+ net-scripts/net.modules.d/adsl | 62 +--
+ net-scripts/net.modules.d/apipa | 47 ++
+ net-scripts/net.modules.d/arping | 100 +----
+ net-scripts/net.modules.d/bonding | 35 --
+ net-scripts/net.modules.d/bridge | 41 --
+ net-scripts/net.modules.d/dhclient | 42 --
+ net-scripts/net.modules.d/dhcpcd | 36 --
+ net-scripts/net.modules.d/essidnet | 35 --
+ net-scripts/net.modules.d/helpers.d/dhcp | 6
+ net-scripts/net.modules.d/helpers.d/functions | 49 ++
+ net-scripts/net.modules.d/helpers.d/module-loader | 26 +
+ net-scripts/net.modules.d/ifconfig | 49 --
+ net-scripts/net.modules.d/ifplugd | 38 --
+ net-scripts/net.modules.d/ipppd | 26 -
+ net-scripts/net.modules.d/iproute2 | 50 --
+ net-scripts/net.modules.d/iptunnel | 42 --
+ net-scripts/net.modules.d/iwconfig | 34 --
+ net-scripts/net.modules.d/macchanger | 32 -
+ net-scripts/net.modules.d/macnet | 35 --
+ net-scripts/net.modules.d/netplugd | 36 --
+ net-scripts/net.modules.d/pppd | 15
+ net-scripts/net.modules.d/pump | 35 --
+ net-scripts/net.modules.d/rename | 33 -
+ net-scripts/net.modules.d/system | 37 --
+ net-scripts/net.modules.d/tuntap | 34 --
+ net-scripts/net.modules.d/udhcpc | 52 ---
+ net-scripts/net.modules.d/vlan | 40 --
+ net-scripts/net.modules.d/wpa_supplicant | 54 ---
+ sbin/runscript.sh | 12
+ src/core/parse.c | 2
+ 37 files changed, 793 insertions(+), 1006 deletions(-)
20 Oct 2005; Christian Heim <phreak@gentoo.org>:
Merging changes from baselayout 1583.
- ChangeLog | 26 +++
- ChangeLog.vserver | 7 +
- net-scripts/net.modules.d/helpers.d/dhcpcd-wrapper | 2
- net-scripts/net.modules.d/iwconfig | 1
- net-scripts/net.modules.d/wpa_supplicant | 123 ++++++++++--------
- sbin/MAKEDEV | 1
- sbin/functions.sh | 8 -
- sbin/rc-daemon.sh | 17 ++
- sbin/rc-services.sh | 13 +
- 9 files changed, 141 insertions(+), 57 deletions(-)
+ ChangeLog | 26 +++
+ ChangeLog.vserver | 7 +
+ net-scripts/net.modules.d/helpers.d/dhcpcd-wrapper | 2
+ net-scripts/net.modules.d/iwconfig | 1
+ net-scripts/net.modules.d/wpa_supplicant | 123 ++++++++++--------
+ sbin/MAKEDEV | 1
+ sbin/functions.sh | 8 -
+ sbin/rc-daemon.sh | 17 ++
+ sbin/rc-services.sh | 13 +
+ 9 files changed, 141 insertions(+), 57 deletions(-)
16 Oct 2005; Christian Heim <phreak@gentoo.org>:
Merging changes from baselayout revision 1572
- ChangeLog | 9 +++++++--
- ChangeLog.vserver | 4 ++++
- etc/group | 2 --
- etc/passwd | 2 --
- sbin/rc-services.sh | 8 ++------
- 5 files changed, 13 insertions(+), 12 deletions(-)
+ ChangeLog | 9 +++++++--
+ ChangeLog.vserver | 4 ++++
+ etc/group | 2 --
+ etc/passwd | 2 --
+ sbin/rc-services.sh | 8 ++------
+ 5 files changed, 13 insertions(+), 12 deletions(-)
16 Oct 2005; Benedikt Boehm <hollow@gentoo.org>:
Fix openvz device nodes.
- sbin/MAKEDEV | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ sbin/MAKEDEV | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
12 Oct 2005; Christian Heim <phreak@gentoo.org>:
Syncing up with baselayout revision 1566 (_pre9-r1)
- ChangeLog | 24 ++++++
- ChangeLog.vserver | 9 ++
- man/start-stop-daemon.8 | 8 ++
- net-scripts/init.d/net.lo | 8 +-
- net-scripts/net.modules.d/arping | 3
- net-scripts/net.modules.d/helpers.d/dhcpcd-wrapper | 33 ++++++---
- net-scripts/net.modules.d/ifconfig | 2
- net-scripts/net.modules.d/ifplugd | 10 ++
- net-scripts/net.modules.d/netplugd | 12 ++-
- net-scripts/net.modules.d/tuntap | 9 ++
- sbin/rc-daemon.sh | 32 ++++++---
- src/start-stop-daemon.c | 62 ++++++++++++++----
- 12 files changed, 172 insertions(+), 40 deletions(-)
+ ChangeLog | 24 ++++++
+ ChangeLog.vserver | 9 ++
+ man/start-stop-daemon.8 | 8 ++
+ net-scripts/init.d/net.lo | 8 +-
+ net-scripts/net.modules.d/arping | 3
+ net-scripts/net.modules.d/helpers.d/dhcpcd-wrapper | 33 ++++++---
+ net-scripts/net.modules.d/ifconfig | 2
+ net-scripts/net.modules.d/ifplugd | 10 ++
+ net-scripts/net.modules.d/netplugd | 12 ++-
+ net-scripts/net.modules.d/tuntap | 9 ++
+ sbin/rc-daemon.sh | 32 ++++++---
+ src/start-stop-daemon.c | 62 ++++++++++++++----
+ 12 files changed, 172 insertions(+), 40 deletions(-)
09 Oct 2005; Benedikt Boehm <hollow@gentoo.org>:
Adding back net.lo services.
- net-scripts/net.modules.d/net.lo | 954 ++++++++++++++++++
- 1 file changed, 954 insertions(+)
+ net-scripts/net.modules.d/net.lo | 954 ++++++++++++++++++
+ 1 file changed, 954 insertions(+)
09 Oct 2005; Benedikt Boehm <hollow@gentoo.org>:
Fix net services.
- ChangeLog.vserver | 3 +
- etc/conf.d/rc | 30 ++++++++++++++++++
- sbin/functions.sh | 2 -
- src/mount/mount.c | 7 ++--
- 4 files changed, 38 insertions(+), 4 deletions(-)
+ ChangeLog.vserver | 3 +
+ etc/conf.d/rc | 30 ++++++++++++++++++
+ sbin/functions.sh | 2 -
+ src/mount/mount.c | 7 ++--
+ 4 files changed, 38 insertions(+), 4 deletions(-)
09 Oct 2005; Benedikt Boehm <hollow@gentoo.org>:
Add back net services.
- etc/hosts | 2
- init.d/bootmisc | 13
- init.d/net | 1
- man/MAKEDEV.8 | 1201 +++++++++++++++---
- net-scripts/conf.d/net | 4
- net-scripts/conf.d/net.example | 617 +++++++++
- net-scripts/conf.d/wireless.example | 283 ++++
- net-scripts/net.modules.d/adsl | 101 +
- net-scripts/net.modules.d/arping | 158 ++
- net-scripts/net.modules.d/bonding | 125 +
- net-scripts/net.modules.d/bridge | 227 +++
- net-scripts/net.modules.d/dhclient | 196 ++
- net-scripts/net.modules.d/dhcpcd | 166 ++
- net-scripts/net.modules.d/essidnet | 79 +
- net-scripts/net.modules.d/helpers.d/dhclient-wrapper | 45
- net-scripts/net.modules.d/helpers.d/dhcp | 130 +
- net-scripts/net.modules.d/helpers.d/dhcp-state | 31
- net-scripts/net.modules.d/helpers.d/dhcpcd-wrapper | 51
- net-scripts/net.modules.d/helpers.d/functions | 577 ++++++++
- net-scripts/net.modules.d/helpers.d/module-loader | 47
- net-scripts/net.modules.d/helpers.d/pump-wrapper | 37
- net-scripts/net.modules.d/helpers.d/udhcpc-wrapper | 20
- net-scripts/net.modules.d/ifconfig | 445 ++++++
- net-scripts/net.modules.d/ifplugd | 156 ++
- net-scripts/net.modules.d/ipppd | 103 +
- net-scripts/net.modules.d/iproute2 | 382 +++++
- net-scripts/net.modules.d/iptunnel | 84 +
- net-scripts/net.modules.d/iwconfig | 935 ++++++++++++++
- net-scripts/net.modules.d/macchanger | 126 +
- net-scripts/net.modules.d/macnet | 72 +
- net-scripts/net.modules.d/netplugd | 143 ++
- net-scripts/net.modules.d/pppd | 268 ++++
- net-scripts/net.modules.d/pump | 136 ++
- net-scripts/net.modules.d/rename | 86 +
- net-scripts/net.modules.d/system | 162 ++
- net-scripts/net.modules.d/tuntap | 116 +
- net-scripts/net.modules.d/udhcpc | 153 ++
- net-scripts/net.modules.d/vlan | 169 ++
- net-scripts/net.modules.d/wpa_supplicant | 365 +++++
- sbin/MAKEDEV | 637 ++++++---
- sbin/functions.sh | 1
- sbin/rc | 17
- sbin/rc-services.sh | 115 +
- sbin/rc-update | 10
- sbin/runscript.sh | 79 +
- src/awk/cachedepends.awk | 4
- src/awk/gendepends.awk | 11
- 47 files changed, 8482 insertions(+), 404 deletions(-)
+ etc/hosts | 2
+ init.d/bootmisc | 13
+ init.d/net | 1
+ man/MAKEDEV.8 | 1201 +++++++++++++++---
+ net-scripts/conf.d/net | 4
+ net-scripts/conf.d/net.example | 617 +++++++++
+ net-scripts/conf.d/wireless.example | 283 ++++
+ net-scripts/net.modules.d/adsl | 101 +
+ net-scripts/net.modules.d/arping | 158 ++
+ net-scripts/net.modules.d/bonding | 125 +
+ net-scripts/net.modules.d/bridge | 227 +++
+ net-scripts/net.modules.d/dhclient | 196 ++
+ net-scripts/net.modules.d/dhcpcd | 166 ++
+ net-scripts/net.modules.d/essidnet | 79 +
+ net-scripts/net.modules.d/helpers.d/dhclient-wrapper | 45
+ net-scripts/net.modules.d/helpers.d/dhcp | 130 +
+ net-scripts/net.modules.d/helpers.d/dhcp-state | 31
+ net-scripts/net.modules.d/helpers.d/dhcpcd-wrapper | 51
+ net-scripts/net.modules.d/helpers.d/functions | 577 ++++++++
+ net-scripts/net.modules.d/helpers.d/module-loader | 47
+ net-scripts/net.modules.d/helpers.d/pump-wrapper | 37
+ net-scripts/net.modules.d/helpers.d/udhcpc-wrapper | 20
+ net-scripts/net.modules.d/ifconfig | 445 ++++++
+ net-scripts/net.modules.d/ifplugd | 156 ++
+ net-scripts/net.modules.d/ipppd | 103 +
+ net-scripts/net.modules.d/iproute2 | 382 +++++
+ net-scripts/net.modules.d/iptunnel | 84 +
+ net-scripts/net.modules.d/iwconfig | 935 ++++++++++++++
+ net-scripts/net.modules.d/macchanger | 126 +
+ net-scripts/net.modules.d/macnet | 72 +
+ net-scripts/net.modules.d/netplugd | 143 ++
+ net-scripts/net.modules.d/pppd | 268 ++++
+ net-scripts/net.modules.d/pump | 136 ++
+ net-scripts/net.modules.d/rename | 86 +
+ net-scripts/net.modules.d/system | 162 ++
+ net-scripts/net.modules.d/tuntap | 116 +
+ net-scripts/net.modules.d/udhcpc | 153 ++
+ net-scripts/net.modules.d/vlan | 169 ++
+ net-scripts/net.modules.d/wpa_supplicant | 365 +++++
+ sbin/MAKEDEV | 637 ++++++---
+ sbin/functions.sh | 1
+ sbin/rc | 17
+ sbin/rc-services.sh | 115 +
+ sbin/rc-update | 10
+ sbin/runscript.sh | 79 +
+ src/awk/cachedepends.awk | 4
+ src/awk/gendepends.awk | 11
+ 47 files changed, 8482 insertions(+), 404 deletions(-)
07 Oct 2005; Christian Heim <phreak@gentoo.org>:
Refreshing baselayout-vserver with revision 1560 from baselayout.
- ChangeLog | 24 ++++++++
- ChangeLog.vserver | 4 +
- sbin/rc-update | 49 +++++++++---------
- src/consoletype.c | 2
- 4 files changed, 56 insertions(+), 23 deletions(-)
+ ChangeLog | 24 ++++++++
+ ChangeLog.vserver | 4 +
+ sbin/rc-update | 49 +++++++++---------
+ src/consoletype.c | 2
+ 4 files changed, 56 insertions(+), 23 deletions(-)
28 Sep 2005; Christian Heim <phreak@gentoo.org>:
Adding kir's proc mounting utility, which should save us from util-linux and
its mass of dependencies.
- src/mount/Makefile | 39 ++++++++++++++++++
- src/mount/mount.c | 24 +++++++++++
- 2 files changed, 63 insertions(+)
+ src/mount/Makefile | 39 ++++++++++++++++++
+ src/mount/mount.c | 24 +++++++++++
+ 2 files changed, 63 insertions(+)
27 Sep 2005; Christian Heim <phreak@gentoo.org>:
Adding ptyp[0-5] and ttyP[0-5] to our generic-vserver rule, which makes
baselayout-vserver also usable for openvz.
- sbin/MAKEDEV | 6 ++++++
- 1 file changed, 6 insertions(+)
+ sbin/MAKEDEV | 6 ++++++
+ 1 file changed, 6 insertions(+)
26 Sep 2005; Benedikt Boehm <hollow@gentoo.org>:
Merging our baselayout-vserver with baselayout (revision 1550)
- ChangeLog | 186 +++++
- etc/conf.d/domainname | 21
- etc/conf.d/env_whitelist | 11
- etc/group | 7
- etc/passwd | 7
- sbin/depscan.sh | 4
- sbin/env-update.sh | 11
- sbin/functions.sh | 151 ++--
- sbin/init-common-post.sh | 58 +
- sbin/init-common-pre.sh | 7
- sbin/init-functions.sh | 57 +
- sbin/init.linux.sh | 43 +
- sbin/rc | 189 +----
- sbin/rc-daemon.sh | 13
- sbin/rc-help.sh | 116 ++-
- sbin/rc-services.sh | 164 ++--
- sbin/runscript.sh | 32
- src/awk/genenviron.awk | 9
- src/core/ChangeLog | 71 ++
- src/core/Makefile | 4
- src/core/TODO | 11
- src/core/debug.h | 6
- src/core/depend.c | 107 +--
- src/core/misc.c | 98 +-
- src/core/misc.h | 68 --
- src/core/parse.c | 598 ++++++++----------
- src/core/parse.h | 1
- src/core/simple-regex.c | 151 +---
- src/core/simple-regex.h | 8
- src/env_whitelist | 1
- src/runscript.c | 3
- src/start-stop-daemon.c | 323 +++++----
- 32 files changed, 1415 insertions(+), 1121 deletions(-)
+ ChangeLog | 186 +++++
+ etc/conf.d/domainname | 21
+ etc/conf.d/env_whitelist | 11
+ etc/group | 7
+ etc/passwd | 7
+ sbin/depscan.sh | 4
+ sbin/env-update.sh | 11
+ sbin/functions.sh | 151 ++--
+ sbin/init-common-post.sh | 58 +
+ sbin/init-common-pre.sh | 7
+ sbin/init-functions.sh | 57 +
+ sbin/init.linux.sh | 43 +
+ sbin/rc | 189 +----
+ sbin/rc-daemon.sh | 13
+ sbin/rc-help.sh | 116 ++-
+ sbin/rc-services.sh | 164 ++--
+ sbin/runscript.sh | 32
+ src/awk/genenviron.awk | 9
+ src/core/ChangeLog | 71 ++
+ src/core/Makefile | 4
+ src/core/TODO | 11
+ src/core/debug.h | 6
+ src/core/depend.c | 107 +--
+ src/core/misc.c | 98 +-
+ src/core/misc.h | 68 --
+ src/core/parse.c | 598 ++++++++----------
+ src/core/parse.h | 1
+ src/core/simple-regex.c | 151 +---
+ src/core/simple-regex.h | 8
+ src/env_whitelist | 1
+ src/runscript.c | 3
+ src/start-stop-daemon.c | 323 +++++----
+ 32 files changed, 1415 insertions(+), 1121 deletions(-)
22 Sep 2005; Benedikt Boehm <hollow@gentoo.org>:
Fix the init timeout issue, caused by a missing inittab.
- etc/inittab | 3 +++
- 1 file changed, 3 insertions(+)
+ etc/inittab | 3 +++
+ 1 file changed, 3 insertions(+)
09 Sep 2005; Benedikt Boehm <hollow@gentoo.org>:
Remove the support for bootlog; add proper support for gentoo init style;
Fix some minor bugs.
- etc/conf.d/rc | 7 +---
- sbin/functions.sh | 1
- sbin/rc | 30 ++++++++++--------
- sbin/rc-services.sh | 2 -
- 4 files changed, 22 insertions(+), 18 deletions(-)
+ etc/conf.d/rc | 7 +---
+ sbin/functions.sh | 1
+ sbin/rc | 30 ++++++++++--------
+ sbin/rc-services.sh | 2 -
+ 4 files changed, 22 insertions(+), 18 deletions(-)
04 Sep 2005; Benedikt Boehm <hollow@gentoo.org>:
Initial version. Here are the base changes:
- bin/rc-status | 8
- etc/conf.d/clock | 26
- etc/conf.d/consolefont | 16
- etc/conf.d/keymaps | 26
- etc/conf.d/net | 4
- etc/conf.d/net.example | 570 -----------------
- etc/conf.d/rc | 106 ---
- etc/conf.d/wireless.example | 283 --------
- etc/filesystems | 14
- etc/fstab | 30
- etc/hosts | 2
- etc/inittab | 26
- etc/issue | 3
- etc/issue.devfix | 21
- etc/issue.logo | 13
- etc/rc.conf | 31
- etc/sysctl.conf | 48 -
- init.d/bootmisc | 73 --
- init.d/checkfs | 55 -
- init.d/checkroot | 125 ---
- init.d/clock | 145 ----
- init.d/consolefont | 69 --
- init.d/domainname | 2
- init.d/dummy | 13
- init.d/halt.sh | 234 -------
- init.d/hostname | 4
- init.d/keymaps | 80 --
- init.d/localmount | 48 -
- init.d/modules | 123 ---
- init.d/net | 1
- init.d/net.eth0 | 1
- init.d/netmount | 94 --
- init.d/numlock | 35 -
- init.d/reboot.sh | 2
- init.d/rmnologin | 4
- init.d/shutdown.sh | 2
- init.d/urandom | 38 -
- man/modules-update.8 | 51 -
- man/modules.autoload.5 | 19
- rc-lists/boot | 10
- rc-lists/default | 2
- rc-lists/nonetwork | 1
- sbin/MAKEDEV | 11
- sbin/MAKEDEV-gentoo.patch | 210 ------
- sbin/functions.sh | 150 ----
- sbin/modules-update | 240 -------
- sbin/rc | 578 ------------------
- sbin/rc-services.sh | 124 ---
- sbin/rc-update | 9
- sbin/runscript.sh | 83 --
- src/awk/cachedepends.awk | 4
- src/awk/gendepends.awk | 11
- 52 files changed, 93 insertions(+), 3785 deletions(-)
-
-# vim:ts=4:filetype=gentoo-changelog
+ bin/rc-status | 8
+ etc/conf.d/clock | 26
+ etc/conf.d/consolefont | 16
+ etc/conf.d/keymaps | 26
+ etc/conf.d/net | 4
+ etc/conf.d/net.example | 570 -----------------
+ etc/conf.d/rc | 106 ---
+ etc/conf.d/wireless.example | 283 --------
+ etc/filesystems | 14
+ etc/fstab | 30
+ etc/hosts | 2
+ etc/inittab | 26
+ etc/issue | 3
+ etc/issue.devfix | 21
+ etc/issue.logo | 13
+ etc/rc.conf | 31
+ etc/sysctl.conf | 48 -
+ init.d/bootmisc | 73 --
+ init.d/checkfs | 55 -
+ init.d/checkroot | 125 ---
+ init.d/clock | 145 ----
+ init.d/consolefont | 69 --
+ init.d/domainname | 2
+ init.d/dummy | 13
+ init.d/halt.sh | 234 -------
+ init.d/hostname | 4
+ init.d/keymaps | 80 --
+ init.d/localmount | 48 -
+ init.d/modules | 123 ---
+ init.d/net | 1
+ init.d/net.eth0 | 1
+ init.d/netmount | 94 --
+ init.d/numlock | 35 -
+ init.d/reboot.sh | 2
+ init.d/rmnologin | 4
+ init.d/shutdown.sh | 2
+ init.d/urandom | 38 -
+ man/modules-update.8 | 51 -
+ man/modules.autoload.5 | 19
+ rc-lists/boot | 10
+ rc-lists/default | 2
+ rc-lists/nonetwork | 1
+ sbin/MAKEDEV | 11
+ sbin/MAKEDEV-gentoo.patch | 210 ------
+ sbin/functions.sh | 150 ----
+ sbin/modules-update | 240 -------
+ sbin/rc | 578 ------------------
+ sbin/rc-services.sh | 124 ---
+ sbin/rc-update | 9
+ sbin/runscript.sh | 83 --
+ src/awk/cachedepends.awk | 4
+ src/awk/gendepends.awk | 11
+ 52 files changed, 93 insertions(+), 3785 deletions(-)
+
+# vim: filetype=gentoo-changelog expandtab softtabstop=4 tabstop=4 shiftwidth=4 :
diff --git a/etc/conf.d/rc b/etc/conf.d/rc
index 12cba6d..3bbcecc 100644
--- a/etc/conf.d/rc
+++ b/etc/conf.d/rc
@@ -94,18 +94,28 @@ RC_KILL_CHILDREN="no"
RC_WAIT_ON_START="0.1"
+##############################################################################
+# SERVICE CONFIGURATION VARIABLES
+# These variables are documented here, but should be configured in
+# /etc/conf.d/foo for service foo and NOT enabled here unless you
+# really want them to work on a global basis.
+
# Some daemons are started and stopped via start-stop-daemon.
-# We can change launch them through other daemons here, for example valgrind.
+# We can launch them through other daemons here, for example valgrind.
# This is only useful for serious debugging of the daemon
-# Note non alphanumeric chars in the script name need to be changed to _
-# This is shown in the below example.
# WARNING: If the script's "stop" function does not supply a PID file then
# all processes using the same daemon will be killed.
-#RC_DAEMON_syslog_ng="/usr/bin/valgrind --tool=memcheck --log-file=/tmp/valgrind.syslog-ng"
+#RC_DAEMON="/usr/bin/valgrind --tool=memcheck --log-file=/tmp/valgrind.syslog-ng"
# strace needs to be prefixed with --background as it does not detach when
# it's following
-#RC_DAEMON_syslog_ng="--background /usr/sbin/strace -f -o /tmp/strace.syslog-ng"
+#RC_DAEMON="--background /usr/sbin/strace -f -o /tmp/strace.syslog-ng"
+
+# Pass ulimit parameters
+#RC_ULIMIT="-u 30"
+
+##############################################################################
+
#
# Internal configuration variables
@@ -113,7 +123,6 @@ RC_WAIT_ON_START="0.1"
# NB: These are for advanced users, and you should really
# know what you are doing before changing them!
#
-
# rc-scripts dep-cache directory
#
diff --git a/etc/services b/etc/services
index 1db81d2..0b2e750 100644
--- a/etc/services
+++ b/etc/services
@@ -595,7 +595,7 @@ qrh 752/tcp passwd_server
qrh 752/udp passwd_server # Kerberos passwd server
rrh 753/tcp
rrh 753/udp
-tell 754/tcp send krb_prop # Kerberos slave propagation
+tell 754/tcp send krb_prop krb5_prop # Kerberos slave propagation
tell 754/udp send
nlogin 758/tcp
nlogin 758/udp
diff --git a/net-scripts/net.modules.d/ifconfig b/net-scripts/net.modules.d/ifconfig
index eacbd57..35db157 100644
--- a/net-scripts/net.modules.d/ifconfig
+++ b/net-scripts/net.modules.d/ifconfig
@@ -103,7 +103,6 @@ ifconfig_get_address() {
ifconfig_is_ethernet() {
ifconfig "$1" | grep -q "^$1[[:space:]]*Link encap:Ethernet[[:space:]]"
}
-
# void ifconfig_get_mac_address(char *interface)
#
diff --git a/net-scripts/net.modules.d/iwconfig b/net-scripts/net.modules.d/iwconfig
index 98c929e..68f70b3 100644
--- a/net-scripts/net.modules.d/iwconfig
+++ b/net-scripts/net.modules.d/iwconfig
@@ -163,7 +163,7 @@ iwconfig_user_config() {
# Apply the user configuration
conf="iwconfig_${ifvar}"
if [[ -n ${!conf} ]]; then
- aconf=( "${!conf} ")
+ aconf=( "${!conf}" )
for conf in "${aconf[@]}" ; do
if ! eval iwconfig "${iface}" "${conf}" ; then
ewarn "${iface} does not support the following configuration commands"
@@ -225,15 +225,16 @@ iwconfig_setup_specific() {
fi
fi
- iwconfig_user_config "${iface}" "${ESSIDVAR}"
-
- # Finally set the ESSID
+ # Then set the ESSID
if ! iwconfig "${iface}" essid "${ESSID}" ; then
eerror "${iface} does not support setting ESSID to \"${dessid}\""
return 1
fi
iwconfig "${iface}" nick "${ESSID}" 2>/dev/null
+ # Finally apply the user Config
+ iwconfig_user_config "${iface}" "${ESSIDVAR}"
+
iwconfig_report "${iface}"
return 0
@@ -358,8 +359,6 @@ iwconfig_associate() {
[[ ${key} != "off" ]] && w=$( iwconfig_get_wep_status "${iface}" )
fi
- iwconfig_user_config "${iface}" "${ESSIDVAR}"
-
if ! iwconfig "${iface}" essid "${ESSID}" ; then
if [[ ${ESSID} != "any" ]]; then
ewarn "${iface} does not support setting ESSID to \"${dessid}\""
@@ -367,6 +366,9 @@ iwconfig_associate() {
fi
iwconfig "${iface}" nick "${ESSID}" 2>/dev/null
+ # Finally apply the user Config
+ iwconfig_user_config "${iface}" "${ESSIDVAR}"
+
vebegin "Connecting to \"${dessid}\" ${w}"
if [[ ${ESSID} != "any" ]] && is_function preassociate ; then
diff --git a/sbin/init-common-post.sh b/sbin/init-common-post.sh
index 2537b21..3aed8b8 100755
--- a/sbin/init-common-post.sh
+++ b/sbin/init-common-post.sh
@@ -41,6 +41,9 @@ rm -rf $(ls -d1 "${svcdir}/"* 2>/dev/null | \
echo "sysinit" > "${svcdir}/softlevel"
+# Ensure all critical services have are in the boot runlevel
+check_critical_services
+
# Update the dependency cache
/sbin/depscan.sh -u
@@ -55,4 +58,7 @@ echo "sysinit" > "${svcdir}/softlevel"
done
)
+# sysinit is now done, so allow init scripts to run normally
+[[ -e /dev/.rcsysinit ]] && rm -f /dev/.rcsysinit
+
# vim:ts=4
diff --git a/sbin/rc b/sbin/rc
index 6527d16..eb4a78d 100755
--- a/sbin/rc
+++ b/sbin/rc
@@ -27,6 +27,21 @@ get_critical_services() {
return 0
}
+# void check_critical_services()
+#
+# Ensure that critical services are in the boot runlevel
+#
+check_critical_services() {
+ local x
+
+ for x in ${CRITICAL_SERVICES} ; do
+ if [[ ! -L "/etc/runlevels/${BOOTLEVEL}/${x}" ]] ; then
+ ewarn "WARNING: Adding critical service ${x} to the ${BOOTLEVEL} runlevel"
+ ln -snf "/etc/init.d/${x}" "/etc/runlevels/${BOOTLEVEL}/${x}"
+ fi
+ done
+}
+
# Save $1
argv1=$1
@@ -56,6 +71,9 @@ then
argv1="${BOOTLEVEL}"
fi
+# Ensure all critical services have are in the boot runlevel
+get_critical_services
+check_critical_services
source "${svclib}/sh/rc-services.sh"
if [[ -f "${svcdir}/softlevel" ]] ; then
diff --git a/sbin/rc-daemon.sh b/sbin/rc-daemon.sh
index c8cccb5..7e67dcc 100755
--- a/sbin/rc-daemon.sh
+++ b/sbin/rc-daemon.sh
@@ -101,9 +101,8 @@ rc_setup_daemon_vars() {
# We may want to launch the daemon with a custom command
# This is mainly useful for debugging with apps like valgrind, strace
local bash_service="$( bash_variable "${myservice}" )"
- eval x=\"\$\{RC_DAEMON_${bash_service}\}\"
- if [[ -n ${x} ]]; then
- local -a d=( ${x} )
+ if [[ -n ${RC_DAEMON} ]]; then
+ local -a d=( ${RC_DAEMON} )
if ${stopping}; then
args="--stop"
else
@@ -145,7 +144,7 @@ rc_try_kill_pid() {
pkill "-${signal}" -s "${pid}"
pgrep -s "${pid}" >/dev/null || return 0
else
- local pids="$(ps -eo pid,sid | sed -n 's/'${pid}'$//p')"
+ local pids="$(ps -eo pid,sid | sed -n "s/ ${pid}\$//p")"
[[ -z ${pids} ]] && return 0
kill -s "${signal}" ${pids} 2>/dev/null
e=false
@@ -297,7 +296,7 @@ rc_stop_daemon() {
else
local npids
for pid in ${pids} ; do
- npids="${npids} $(ps -eo pid,ppid | sed -n 's/'"${pid}"'$//p')"
+ npids="${npids} $(ps -eo pid,ppid | sed -n "s/ ${pid}\$//p")"
done
pids="${pids} ${npids}"
fi
diff --git a/sbin/runscript.sh b/sbin/runscript.sh
index 7fdd89e..8441fcc 100755
--- a/sbin/runscript.sh
+++ b/sbin/runscript.sh
@@ -20,7 +20,12 @@ fi
myservice="${myservice##*/}"
export SVCNAME="${myservice}"
-mylevel="$(< "${svcdir}/softlevel")"
+
+# Stop init scripts from working until sysinit completes
+if [[ -e /dev/.rcsysinit ]] ; then
+ eerror "ERROR: cannot run ${myservice} until sysinit completes"
+ exit 1
+fi
svc_trap() {
trap 'eerror "ERROR: ${myservice} caught an interrupt"; exit 1' \
@@ -69,6 +74,11 @@ conf="$(add_suffix "/etc/conf.d/${myservice}")"
conf="$(add_suffix /etc/rc.conf)"
[[ -e ${conf} ]] && source "${conf}"
+mylevel="${SOFTLEVEL}"
+[[ ${SOFTLEVEL} == "${BOOTLEVEL}" \
+ || ${SOFTLEVEL} == "reboot" || ${SOFTLEVEL} == "shutdown" ]] \
+ && mylevel="${DEFAULTLEVEL}"
+
# Call svc_quit if we abort AND we have obtained a lock
service_started "${myservice}"
svcstarted="$?"
@@ -159,7 +169,7 @@ svc_stop() {
trap "svc_quit" INT QUIT TSTP
mark_service_starting "${myservice}"
- service_message "Stopping service ${myservice}"
+ service_message "Service ${myservice} stopping"
if in_runlevel "${myservice}" "${BOOTLEVEL}" && \
[[ ${SOFTLEVEL} != "reboot" && ${SOFTLEVEL} != "shutdown" ]] ; then
@@ -261,7 +271,7 @@ svc_stop() {
else
mark_service_stopped "${myservice}"
fi
- service_message "Stopped service ${myservice}"
+ service_message "Service ${myservice} stopped"
fi
# Reset the trap
@@ -298,7 +308,7 @@ svc_start() {
# Ensure that we clean up if we abort for any reason
trap "svc_quit" INT QUIT TSTP
- service_message "Starting service ${myservice}"
+ service_message "Service ${myservice} starting"
# Save the IN_BACKGROUND var as we need to clear it for starting depends
local ib_save="${IN_BACKGROUND}"
@@ -381,8 +391,13 @@ svc_start() {
unset -f exit
exit "$@"
}
+
+ # Apply any ulimits if defined
+ [[ -n ${RC_ULIMIT} ]] && ulimit ${RC_ULIMIT}
+
# Stop einfo/ebegin/eend from working as parallel messes us up
[[ ${RC_PARALLEL_STARTUP} == "yes" ]] && RC_QUIET_STDOUT="yes"
+
start
)
retval="$?"
@@ -606,17 +621,24 @@ for arg in $* ; do
&& rm -Rf "${svcdir}/scheduled/${myservice}"
# Restart dependencies as well
- if service_inactive "${myservice}" ; then
- for x in $(dolisting "${svcdir}/snapshot/$$/") ; do
- if service_stopped "${x##*/}" ; then
+ for x in $(dolisting "${svcdir}/snapshot/$$/") ; do
+ if service_stopped "${x##*/}" ; then
+ if service_inactive "${myservice}" \
+ || service_wasinactive "${myservice}" ; then
svc_schedule_start "${myservice}" "${x##*/}"
+ ewarn "WARNING: ${x##*/} is scheduled to start when ${myservice} has started."
+ else
+ start_service "${x##*/}"
fi
- done
- elif service_started "${myservice}" ; then
- svc_start_scheduled
- fi
-
+ fi
+ done
rm -rf "${svcdir}/snapshot/$$"
+
+ service_started "${myservice}" && svc_start_scheduled
+
+ # Wait for services to come up
+ [[ ${RC_PARALLEL_STARTUP} == "yes" ]] && wait
+
svcrestart="no"
;;
pause)
diff --git a/src/consoletype.c b/src/consoletype.c
index 87dbf07..c8b8dd6 100644
--- a/src/consoletype.c
+++ b/src/consoletype.c
@@ -3,36 +3,67 @@
* simple app to figure out whether the current terminal
* is serial, console (vt), or remote (pty).
*
- * Copyright 1999-2004 Gentoo Foundation
+ * Copyright 1999-2006 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header$
*/
#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
#include <string.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
#include "headers.h"
-int main(int argc, char *argv[])
+enum { IS_VT = 0, IS_SERIAL = 1, IS_PTY = 2, IS_UNK = 3 };
+const char * const tty_names[] = { "vt", "serial", "pty", "unknown" };
+
+static inline int check_ttyname(void)
+{
+ char *tty = ttyname(0);
+
+ if (tty == NULL)
+ return IS_UNK;
+
+ if (strncmp(tty, "/dev/", 5) == 0)
+ tty += 5;
+
+ if (!strncmp (tty, "ttyS", 4) || !strncmp (tty, "cuaa", 4))
+ return IS_SERIAL;
+ else if (!strncmp (tty, "pts/", 4) || !strncmp (tty, "ttyp", 4))
+ return IS_PTY;
+ else if (!strncmp (tty, "tty", 3))
+ return IS_VT;
+ else
+ return IS_UNK;
+}
+
+static inline int check_devnode(void)
{
+#if defined(__linux__)
int maj;
struct stat sb;
fstat(0, &sb);
maj = major(sb.st_rdev);
if (maj != 3 && (maj < 136 || maj > 143)) {
-#if defined(__linux__)
+#if defined(TIOCLINUX)
unsigned char twelve = 12;
- if (ioctl (0, TIOCLINUX, &twelve) < 0) {
- printf("serial\n");
- return 1;
- }
+ if (ioctl (0, TIOCLINUX, &twelve) < 0)
+ return IS_SERIAL;
#endif
- printf("vt\n");
- return 0;
- } else {
- printf("pty\n");
- return 2;
- }
+ return IS_VT;
+ } else
+ return IS_PTY;
+#endif
+ return IS_UNK;
+}
+
+int main(int argc, char *argv[])
+{
+ int type = check_ttyname();
+ if (type == IS_UNK)
+ type = check_devnode();
+ puts(tty_names[type]);
+ return type;
}