rpms/zfs-fuse/devel zfs-fuse.sysconfig, NONE, 1.1 zfs-fuse.spec, 1.2, 1.3 sources, 1.2, 1.3 zfs-fuse.init, 1.1, 1.2 .cvsignore, 1.2, 1.3

[Uwe Kubosch]

Author: donv

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

Modified Files:
	zfs-fuse.spec sources zfs-fuse.init .cvsignore 
Added Files:
	zfs-fuse.sysconfig 
Log Message:
* Sun Dec 21 2008 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-4.20081221
- Updated to upstream trunk of 2008-12-21
- Added config file in /etc/sysconfig/zfs
- Added config option ZFS_AUTOMOUNT=0|1 to mount filesystems at boot



--- NEW FILE zfs-fuse.sysconfig ---
# Set this option to 1 if you want all ZFS filesystems to be mounted on boot.
ZFS_AUTOMOUNT=1


Index: zfs-fuse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/devel/zfs-fuse.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- zfs-fuse.spec	11 Nov 2008 00:28:26 -0000	1.2
+++ zfs-fuse.spec	22 Dec 2008 21:45:14 -0000	1.3
@@ -1,24 +1,26 @@
 Summary:          ZFS ported to Linux FUSE
 Name:             zfs-fuse
 Version:          0.5.0
-Release:          3.20081009%{?dist}
+Release:          4.20081221%{?dist}
 Group:            System Environment/Base
 License:          CDDL
 URL:              http://www.wizy.org/wiki/ZFS_on_FUSE
 # The source for this package was pulled from upstream's vcs.  Use the
 # following command to generate the tarball:
-#   wget http://www.wizy.org/mercurial/zfs-fuse/trunk/archive/4c14f29ce44c.tar.bz2
-#   mv 4c14f29ce44c.tar.bz2 zfs-fuse-0.5.0.tar.bz2
+#   wget http://www.wizy.org/mercurial/zfs-fuse/trunk/archive/008c531499cd.tar.bz2
+#   mv 008c531499cd.tar.bz2 zfs-fuse-0.5.0.tar.bz2
 # The setup line below has been changed to reflect that the top directory of the
 # archive has a different name than the archive itself.
 Source0:          %{name}/%{name}-%{version}.tar.bz2
 Source01:         zfs-fuse.init
+Source02:         zfs-fuse.sysconfig
 BuildRequires:    fuse-devel libaio-devel scons zlib-devel
 Requires:         fuse >= 2.7.4-1
 Requires(post):   chkconfig
 Requires(preun):  chkconfig initscripts
 Requires(postun): initscripts
-# (2008-10-30)(uwe at kubosch.no) zfs-fuse doesn't have PPC and PPC64 implementations for atomic instructions
+# (2008-10-30)(uwe at kubosch.no) zfs-fuse doesn't have PPC and PPC64
+#                              implementations for atomic instructions
 ExcludeArch:      ppc64
 ExcludeArch:      ppc
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,7 +33,7 @@
 operating system.
 
 %prep
-%setup -q -n trunk-4c14f29ce44c
+%setup -q -n trunk-008c531499cd
 f=LICENSE
 %{__mv} $f $f.iso88591
 iconv -o $f -f iso88591 -t utf8 $f.iso88591
@@ -47,6 +49,7 @@
 pushd src
 scons install install_dir=%{buildroot}%{_bindir}
 %{__install} -Dp -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
+%{__install} -Dp -m 0755 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -77,14 +80,21 @@
 %{_bindir}/zpool
 %{_bindir}/ztest
 %{_initrddir}/%{name}
+%{_sysconfdir}/sysconfig/%{name}
 
 %changelog
+* Sun Dec 21 2008 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-4.20081221
+- Updated to upstream trunk of 2008-12-21
+- Added config file in /etc/sysconfig/zfs
+- Added config option ZFS_AUTOMOUNT=0|1 to mount filesystems at boot
+
 * Tue Nov 11 2008 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-3.20081009
 - Rebuild after import into Fedora build system.
 
 * Thu Oct 09 2008 Uwe Kubosh <uwe at kubosch.no> - 0.5.0-2.20081009
 - Updated to upstream trunk of 2008-10-09
-- Adds changes to make zfs-fuse build out-of-the-box on Fedora 9, and removes the need for patches.
+- Adds changes to make zfs-fuse build out-of-the-box on Fedora 9,
+  and removes the need for patches.
 
 * Sat Oct  4 2008 Terje Rosten <terje.rosten at ntnu.no> - 0.5.0-1 
 - initial build


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Nov 2008 23:18:29 -0000	1.2
+++ sources	22 Dec 2008 21:45:14 -0000	1.3
@@ -1 +1 @@
-cbf1c40c6136e061062bca54ccba30c4  zfs-fuse-0.5.0.tar.bz2
+c5c0ecffc28a039301245773a83b3aa6  zfs-fuse-0.5.0.tar.bz2


Index: zfs-fuse.init
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/devel/zfs-fuse.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zfs-fuse.init	10 Nov 2008 23:18:29 -0000	1.1
+++ zfs-fuse.init	22 Dec 2008 21:45:14 -0000	1.2
@@ -22,9 +22,9 @@
 
 exec="/usr/bin/zfs-fuse"
 prog="zfs-fuse"
-#config="<path to major config file>"
+config=/etc/sysconfig/$prog
 
-[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
+[ -e $config ] && . $config
 
 lockfile=/var/lock/subsys/$prog
 
@@ -34,7 +34,21 @@
     daemon $exec
     retval=$?
     echo
-    [ $retval -eq 0 ] && touch $lockfile
+    if [ $retval -eq 0 ] ; then
+    	touch $lockfile
+    	if [ $ZFS_AUTOMOUNT -eq 1 ] ; then
+			echo -n $"Mounting zfs partitions: "
+    		sleep 1
+			zfs mount -a
+			zfs_mount_retval=$?
+			if [ $zfs_mount_retval = 0 ]; then
+				echo_success
+			else
+				echo_warning
+			fi
+			echo
+    	fi
+    fi
     return $retval
 }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/zfs-fuse/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Nov 2008 23:18:29 -0000	1.2
+++ .cvsignore	22 Dec 2008 21:45:14 -0000	1.3
@@ -1 +1,4 @@
 zfs-fuse-0.5.0.tar.bz2
+i386
+trunk-*
+zfs-fuse-*.src.rpm