rpms/zfs-fuse/devel zfs-fuse.init, 1.6, 1.7 zfs-fuse.spec, 1.26, 1.27 zfs-fuse.sysconfig, 1.3, 1.4

[Uwe Kubosch]

Author: donv

Update of /cvs/pkgs/rpms/zfs-fuse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31224/devel

Modified Files:
	zfs-fuse.init zfs-fuse.spec zfs-fuse.sysconfig 
Log Message:
* - Relaxed dependency on fuse from 2.8.0 to 2.7.4 to allow installation on RHEL/Centos 5


Index: zfs-fuse.init
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/devel/zfs-fuse.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- zfs-fuse.init	29 Dec 2009 09:18:23 -0000	1.6
+++ zfs-fuse.init	31 Dec 2009 16:45:15 -0000	1.7
@@ -58,20 +58,20 @@ start() {
     if [ "$ZFS_KILL_ORPHANS" == "yes_really" ] ; then
       echo -n Killing processes with unknown working directory:
       for a in 1 2 3 4 5 ; do
-        orphans=`lsof -w -n | grep "cwd   unknown" | awk '{print $2}'`
+        orphans=`lsof -w -n | awk '$4 == "cwd" && $5 == "unknown" {print $2}'`
         echo -n $orphans
         [ "$orphans" == "" ] && break
         echo -n .
         kill $orphans
         sleep 1
       done
-      orphans=`lsof -w -n | grep "cwd   unknown" | awk '{print $2}'`
+      orphans=`lsof -w -n | awk '$4 == "cwd" && $5 == "unknown" {print $2}'`
       if [ "$orphans" != "" ] ; then
         echo_failure ; echo
         echo -n Some orphans still live: $orphans  Killing with signal 9
         kill -9 $orphans
       fi
-      orphans=`lsof -w -n | grep "cwd   unknown" | awk '{print $2}'`
+      orphans=`lsof -w -n | awk '$4 == "cwd" && $5 == "unknown" {print $2}'`
       if [ "$orphans" != "" ] ; then
         echo_failure ; echo
         echo -n Some orphans still live: $orphans


Index: zfs-fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/devel/zfs-fuse.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- zfs-fuse.spec	29 Dec 2009 09:18:24 -0000	1.26
+++ zfs-fuse.spec	31 Dec 2009 16:45:15 -0000	1.27
@@ -13,7 +13,7 @@ Source01:         zfs-fuse.init
 Source02:         zfs-fuse.scrub
 Source03:         zfs-fuse.sysconfig
 BuildRequires:    fuse-devel libaio-devel scons zlib-devel
-Requires:         fuse >= 2.8.0-1
+Requires:         fuse >= 2.7.4-1
 Requires(post):   chkconfig
 Requires(preun):  chkconfig initscripts
 Requires(postun): initscripts
@@ -99,6 +99,8 @@ fi
 - Added option for killing processes with unknown working directory at zfs-fuse startup.
   This would be the case if zfs-fuse crashed.  Use with care.  It may kill unrelated processes.
   Set ZFS_KILL_ORPHANS=yes_really in /etc/sysconfig/zfs-fuse to enable.
+- Relaxed dependency on fuse from 2.8.0 to 2.7.4 to allow installation on RHEL/Centos 5
+
 * Sat Dec 26 2009 Uwe Kubosch <uwe at kubosch.no> - 0.6.0-5
 - Removed chckconfig on and service start commands from install script
   See https://fedoraproject.org/wiki/Packaging:SysVInitScript#Why_don.27t_we


Index: zfs-fuse.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/devel/zfs-fuse.sysconfig,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- zfs-fuse.sysconfig	29 Dec 2009 09:18:24 -0000	1.3
+++ zfs-fuse.sysconfig	31 Dec 2009 16:45:15 -0000	1.4
@@ -5,5 +5,5 @@ ZFS_AUTOMOUNT=yes
 ZFS_WEEKLY_SCRUB=yes
 
 # Set this option to yes_really to kill all processes with unknown working directory at zfs-fuse startup
-# This might kill processes totally unrelated to zfs-fuse.
+# Use with extreme care.  This will also kill processes totally unrelated to zfs-fuse.
 # ZFS_KILL_ORPHANS=no|yes_really