diff options
| author |   Christian Heim <phreak@gentoo.org> | 2006-02-18 10:16:30 +0000 |
|---|---|---|
| committer | Christian Heim <phreak@gentoo.org> | 2006-02-18 10:16:30 +0000 |
| commit | 7f88b4503e02d4784b0420e4c8ecc83fd463dcd4 (patch) | |
| tree | 52c21ec20b9cacb089fdcf4bc4efbec067669533 | |
| parent | Merging r1909 (diff) | |
| download | baselayout-vserver-7f88b4503e02d4784b0420e4c8ecc83fd463dcd4.tar.gz baselayout-vserver-7f88b4503e02d4784b0420e4c8ecc83fd463dcd4.tar.bz2 baselayout-vserver-7f88b4503e02d4784b0420e4c8ecc83fd463dcd4.zip | |
Merging r1911
svn path=/baselayout-vserver/branches/baselayout-1_12/; revision=247
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ChangeLog.vserver | 10 | ||||
| -rw-r--r-- | net-scripts/net.modules.d/helpers.d/functions | 2 |
3 files changed, 15 insertions, 1 deletions
@@ -1,6 +1,10 @@ # ChangeLog for Gentoo System Intialization ("rc") scripts # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPLv2 + 17 Feb 2006; Roy Marples <uberlord@gentoo.org>: + + Fixed typo in functions, #123136 thanks to Alexander Danilov. + * baselayout-1.12.0_pre16 (16 Feb 2006) 15 Feb 2006; Roy Marples <uberlord@gentoo.org>: diff --git a/ChangeLog.vserver b/ChangeLog.vserver index 5a006f5..6b12fa3 100644 --- a/ChangeLog.vserver +++ b/ChangeLog.vserver @@ -1,6 +1,16 @@ # ChangeLog for Gentoo System Intialization ("rc") scripts # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPLv2 + 18 Feb 2006; Christian Heim <phreak@gentoo.org>: + Merging latest changes to the baselayout-1_12 branch. This merge is based + upon revision 1911. + + ChangeLog | 4 ++++ + ChangeLog.vserver | 10 ++++++++++ + net-scripts/net.modules.d/helpers.d/functions | 2 +- + tarball.sh | 2 +- + 4 files changed, 16 insertions(+), 2 deletions(-) + 17 Feb 2006; Christian Heim <phreak@gentoo.org>: Merging latest changes to the baselayout-1_12 branch. This merge is based upon revision 1909. diff --git a/net-scripts/net.modules.d/helpers.d/functions b/net-scripts/net.modules.d/helpers.d/functions index 058ba95..52f3da1 100644 --- a/net-scripts/net.modules.d/helpers.d/functions +++ b/net-scripts/net.modules.d/helpers.d/functions @@ -74,7 +74,7 @@ apply_state() { local file for file in ${files} ; do # Skip .sv files - [[ ${file} == *".sv" ]] && contine + [[ ${file} == *".sv" ]] && continue local link=$( readlink "/etc/${file}" 2>/dev/null ) if [[ ${link} != "${netdir}/${file}" ]]; then [[ -e "/etc/${file}" ]] && rm -f "/etc/${file}" |