From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QeFFv-0001Z7-H1 for garchives@archives.gentoo.org; Tue, 05 Jul 2011 23:42:15 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C612221C0AE; Tue, 5 Jul 2011 23:42:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 85E5121C0AE for ; Tue, 5 Jul 2011 23:42:05 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 201121B4010 for ; Tue, 5 Jul 2011 23:42:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 758348003D for ; Tue, 5 Jul 2011 23:42:04 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: Subject: [gentoo-commits] proj/openrc:master commit in: init.d/, sh/ X-VCS-Repository: proj/openrc X-VCS-Files: init.d/localmount.in init.d/mount-ro.in init.d/netmount.in sh/rc-functions.sh.in X-VCS-Directories: init.d/ sh/ X-VCS-Committer: WilliamH X-VCS-Committer-Name: William Hubbs X-VCS-Revision: e8e86b96dc8abbdfb7069a267873ef2950eb84cb Date: Tue, 5 Jul 2011 23:42:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: cb71523a91c1da35b53995ddcc81ae74 commit: e8e86b96dc8abbdfb7069a267873ef2950eb84cb Author: William Hubbs gentoo org> AuthorDate: Tue Jul 5 19:33:21 2011 +0000 Commit: William Hubbs gentoo org> CommitDate: Tue Jul 5 23:41:33 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/openrc.git;a=3D= commit;h=3De8e86b96 fix issue with extra_net_fs_list The extra_net_fs_list variable was not being included as it should have been for the net file systems because it was being expanded before it was set by the user. X-Gentoo-Bug: 374133 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=3D374133 --- init.d/localmount.in | 4 ++-- init.d/mount-ro.in | 2 +- init.d/netmount.in | 6 +++--- sh/rc-functions.sh.in | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/init.d/localmount.in b/init.d/localmount.in index 734a7f8..efbddc7 100644 --- a/init.d/localmount.in +++ b/init.d/localmount.in @@ -16,7 +16,7 @@ start() { # Mount local filesystems in /etc/fstab. local types=3D"noproc" x=3D no_netdev=3D - for x in $net_fs_list; do + for x in $net_fs_list $extra_net_fs_list; do types=3D"${types},${x}" done =20 @@ -70,7 +70,7 @@ stop() einfo "Unmounting filesystems" eindent local fs=3D - for x in $net_fs_list; do + for x in $net_fs_list $extra_net_fs_list; do fs=3D"$fs${fs:+|}$x" done [ -n "$fs" ] && fs=3D"^($fs)$" diff --git a/init.d/mount-ro.in b/init.d/mount-ro.in index 4b89b04..dc2a098 100644 --- a/init.d/mount-ro.in +++ b/init.d/mount-ro.in @@ -34,7 +34,7 @@ start() fi m=3D"^($m)$" fs=3D - for x in $net_fs_list; do + for x in $net_fs_list $extra_net_fs_list; do fs=3D"$fs${fs:+|}$x" done [ -n "$fs" ] && fs=3D"^($fs)$" diff --git a/init.d/netmount.in b/init.d/netmount.in index 4cc8842..963ad26 100644 --- a/init.d/netmount.in +++ b/init.d/netmount.in @@ -44,7 +44,7 @@ start() [ -x @SYSCONFDIR@/init.d/rpcbind ] && pmap=3D"rpcbind" =20 local x=3D fs=3D rc=3D - for x in $net_fs_list; do + for x in $net_fs_list $extra_net_fs_list; do case "$x" in nfs|nfs4) # If the nfsmount script took care of the nfs @@ -81,7 +81,7 @@ stop() ebegin "Unmounting network filesystems" . "$RC_LIBEXECDIR"/sh/rc-mount.sh =20 - for x in $net_fs_list; do + for x in $net_fs_list $extra_net_fs_list; do fs=3D"$fs${fs:+,}$x" done if [ -n "$fs" ]; then @@ -90,7 +90,7 @@ stop() =20 eindent fs=3D - for x in $net_fs_list; do + for x in $net_fs_list $extra_net_fs_list; do fs=3D"$fs${fs:+|}$x" done [ -n "$fs" ] && fs=3D"^($fs)$" diff --git a/sh/rc-functions.sh.in b/sh/rc-functions.sh.in index 02f84b4..50ba20b 100644 --- a/sh/rc-functions.sh.in +++ b/sh/rc-functions.sh.in @@ -39,7 +39,7 @@ stop_addon() } =20 net_fs_list=3D"afs cifs coda davfs fuse fuse.sshfs gfs glusterfs lustre -ncpfs nfs nfs4 ocfs2 shfs smbfs $extra_net_fs_list" +ncpfs nfs nfs4 ocfs2 shfs smbfs" is_net_fs() { [ -z "$1" ] && return 1