summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Heim <phreak@gentoo.org>2006-02-14 13:00:44 +0000
committerChristian Heim <phreak@gentoo.org>2006-02-14 13:00:44 +0000
commitedf64857241690199cb5c4a7ada6283daa67be2c (patch)
tree5769bc8952f9bb9c2a3f001f5fa1870e6db8da19 /ChangeLog.vserver
parentMerging r1851 (diff)
downloadbaselayout-vserver-edf64857241690199cb5c4a7ada6283daa67be2c.tar.gz
baselayout-vserver-edf64857241690199cb5c4a7ada6283daa67be2c.tar.bz2
baselayout-vserver-edf64857241690199cb5c4a7ada6283daa67be2c.zip
Merging r1881
svn path=/baselayout-vserver/trunk/; revision=236
Diffstat (limited to 'ChangeLog.vserver')
-rw-r--r--ChangeLog.vserver32
1 files changed, 32 insertions, 0 deletions
diff --git a/ChangeLog.vserver b/ChangeLog.vserver
index 2a752fd..138abb1 100644
--- a/ChangeLog.vserver
+++ b/ChangeLog.vserver
@@ -1,6 +1,38 @@
# ChangeLog for Gentoo System Intialization ("rc") scripts
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPLv2
+ 14 Feb 2006; Christian Heim <phreak@gentoo.org>:
+ Importing latest baselayout/trunk changes. This merge is based upon
+ revision 1881.
+
+ ChangeLog | 36 ++++
+ ChangeLog.vserver | 32 +++
+ etc/group | 4
+ etc/passwd | 3
+ etc/shadow | 2
+ net-scripts/conf.d/net.example | 25 ++
+ net-scripts/init.d/net.lo | 124 +++++++-------
+ net-scripts/net.modules.d/bonding | 3
+ net-scripts/net.modules.d/bridge | 3
+ net-scripts/net.modules.d/dhcpcd | 10 -
+ net-scripts/net.modules.d/essidnet | 2
+ net-scripts/net.modules.d/ifconfig | 4
+ net-scripts/net.modules.d/ip6to4 | 90 ++++++++++
+ net-scripts/net.modules.d/iproute2 | 152 +++++++++++-------
+ net-scripts/net.modules.d/iptunnel | 4
+ net-scripts/net.modules.d/iwconfig | 89 +++++-----
+ net-scripts/net.modules.d/macnet | 2
+ net-scripts/net.modules.d/pppd | 64 +++----
+ net-scripts/net.modules.d/tuntap | 3
+ net-scripts/net.modules.d/wpa_supplicant | 51 +++---
+ sbin/runscript.sh | 6
+ src/core/autogen.sh | 4
+ src/core/configure.ac | 17 +-
+ src/core/scripts/svn2cl.sh | 97 +++++++++--
+ src/core/scripts/svn2cl.xsl | 79 ++++++---
+ src/core/src/runscript.c | 6
+ 26 files changed, 615 insertions(+), 297 deletions(-)
+
06 Feb 2006; Christian Heim <phreak@gentoo.org>:
Importing latest baselayout/trunk changes. This merge is based upon
revision 1851.