summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'ChangeLog.vserver')
-rw-r--r--ChangeLog.vserver36
1 files changed, 19 insertions, 17 deletions
diff --git a/ChangeLog.vserver b/ChangeLog.vserver
index 0e7ab51..24ab7e6 100644
--- a/ChangeLog.vserver
+++ b/ChangeLog.vserver
@@ -3,12 +3,12 @@
10 Jan 2005; Christian Heim <phreak@gentoo.org>:
Importing latest baselayout/trunk changes. This merge is based upon
- revision 1798.
+ revision 1799.
- ChangeLog | 114 ++++++++++++------
- ChangeLog.vserver | 58 +++++++++
+ ChangeLog | 131 ++++++--
+ ChangeLog.vserver | 58 +++
etc/conf.d/domainname | 4
- etc/profile | 14 --
+ etc/profile | 14
init.d/bootmisc | 2
init.d/domainname | 4
init.d/dummy | 2
@@ -19,13 +19,13 @@
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/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/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
@@ -39,23 +39,25 @@
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 +-
+ net-scripts/net.modules.d/iwconfig | 48 +--
+ net-scripts/net.modules.d/wpa_supplicant | 14
sbin/MAKEDEV | 3
- sbin/functions.sh | 29 ++--
+ 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/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 | 41 +++---
+ sbin/runscript.sh | 280 ++++++++----------
src/Makefile | 2
src/awk/genenviron.awk | 2
src/core/ChangeLog.0 | 2
- 50 files changed, 324 insertions(+), 178 deletions(-)
+ 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