summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Heim <phreak@gentoo.org>2006-01-19 17:13:13 +0000
committerChristian Heim <phreak@gentoo.org>2006-01-19 17:13:13 +0000
commit2fc04a041525a0215e9eb3ca54e4617c1be7b4f7 (patch)
tree2d0c6f0239789614db2400bdd742d6aa96c1c201 /ChangeLog.vserver
parentMerging r1828 (diff)
downloadbaselayout-vserver-2fc04a041525a0215e9eb3ca54e4617c1be7b4f7.tar.gz
baselayout-vserver-2fc04a041525a0215e9eb3ca54e4617c1be7b4f7.tar.bz2
baselayout-vserver-2fc04a041525a0215e9eb3ca54e4617c1be7b4f7.zip
Merging r1832
svn path=/baselayout-vserver/trunk/; revision=212
Diffstat (limited to 'ChangeLog.vserver')
-rw-r--r--ChangeLog.vserver14
1 files changed, 14 insertions, 0 deletions
diff --git a/ChangeLog.vserver b/ChangeLog.vserver
index e279dd7..dc6863e 100644
--- a/ChangeLog.vserver
+++ b/ChangeLog.vserver
@@ -1,6 +1,20 @@
# ChangeLog for Gentoo System Intialization ("rc") scripts
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPLv2
+ 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(-)
+
17 Jan 2006; Christian Heim <phreak@gentoo.org>:
Importing latest baselayout/trunk changes. This merge is based upon
revision 1828.