summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Heim <phreak@gentoo.org>2006-01-15 10:42:17 +0000
committerChristian Heim <phreak@gentoo.org>2006-01-15 10:42:17 +0000
commit5ad71a399280f9210b1076099b7ee64ed36ff0b8 (patch)
tree9aa9725a755b67b0c86a718ba8cecc42f6ac6f20 /ChangeLog.vserver
parentMerging r1802 (diff)
downloadbaselayout-vserver-5ad71a399280f9210b1076099b7ee64ed36ff0b8.tar.gz
baselayout-vserver-5ad71a399280f9210b1076099b7ee64ed36ff0b8.tar.bz2
baselayout-vserver-5ad71a399280f9210b1076099b7ee64ed36ff0b8.zip
Merging r1822 from trunk
svn path=/baselayout-vserver/trunk/; revision=208
Diffstat (limited to 'ChangeLog.vserver')
-rw-r--r--ChangeLog.vserver21
1 files changed, 21 insertions, 0 deletions
diff --git a/ChangeLog.vserver b/ChangeLog.vserver
index 24e03b1..0311046 100644
--- a/ChangeLog.vserver
+++ b/ChangeLog.vserver
@@ -1,6 +1,27 @@
# ChangeLog for Gentoo System Intialization ("rc") scripts
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPLv2
+ 15 Jan 2005; 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(-)
+
11 Jan 2005; Christian Heim <phreak@gentoo.org>:
Importing latest baselayout/trunk changes. This merge is based upon
revision 1802.