summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Heim <phreak@gentoo.org>2006-04-08 15:00:41 +0000
committerChristian Heim <phreak@gentoo.org>2006-04-08 15:00:41 +0000
commita1e3ed347871cf38ecefb10878be65fedd9cef01 (patch)
tree85c999fa0d480c09bb6153387bd7e1398738bb1a /ChangeLog.vserver
parentMerging net-scripts changes; fixing ChangeLog's (diff)
downloadbaselayout-vserver-a1e3ed347871cf38ecefb10878be65fedd9cef01.tar.gz
baselayout-vserver-a1e3ed347871cf38ecefb10878be65fedd9cef01.tar.bz2
baselayout-vserver-a1e3ed347871cf38ecefb10878be65fedd9cef01.zip
Merging r1965
svn path=/baselayout-vserver/trunk/; revision=315
Diffstat (limited to 'ChangeLog.vserver')
-rw-r--r--ChangeLog.vserver18
1 files changed, 18 insertions, 0 deletions
diff --git a/ChangeLog.vserver b/ChangeLog.vserver
index 4f84d74..021ffdb 100644
--- a/ChangeLog.vserver
+++ b/ChangeLog.vserver
@@ -1,6 +1,24 @@
# ChangeLog for Gentoo System Intialization ("rc") scripts
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPLv2
+ 08 Apr 2006; Christian Heim <phreak@gentoo.org>:
+ Merging latest changes to the baselayout/trunk changes. This merge is based
+ upon revision 1965.
+
+ ChangeLog | 11 +-
+ ChangeLog.vserver | 18 +++
+ net-scripts/conf.d/net.example | 9 -
+ net-scripts/init.d/net.lo | 88 ++++++------------
+ net-scripts/net.modules.d/bridge.sh | 2
+ net-scripts/net.modules.d/iptunnel.sh | 3
+ net-scripts/net.modules.d/iwconfig.sh | 3
+ net-scripts/net.modules.d/tuntap.sh | 4
+ net-scripts/net.modules.d/udhcpc.sh | 5 -
+ net-scripts/net.modules.d/wpa_supplicant.sh | 2
+ sbin/rc | 6 -
+ sbin/runscript.sh | 11 +-
+ 12 files changed, 84 insertions(+), 78 deletions(-)
+
07 Apr 2006; Christian Heim <phreak@gentoo.org>:
Merging latest changes to the baselayout/trunk changes. This merge is based
upon revision 1959.