Fixed own symlinked files corruption during 'rpm -U'.

diff --git a/debian/lufs.files b/debian/lufs.files
index 75e88e6..b8409bd 100644 (file)
--- a/debian/lufs.files
+++ b/debian/lufs.files
@@ -15,3 +15,6 @@
 /usr/bin/lufsumount
 /usr/include/lufs
 /usr/lib/lib*.la
+/etc/auto.sshfs
+/etc/auto.ftpfs
+/sbin/mount.lufs

diff --git a/debian/postinst b/debian/postinst
index 1cb71c8..6b5da15 100755 (executable)
--- a/debian/postinst
+++ b/debian/postinst
@@ -17,9 +17,6 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 
-ln -s /usr/bin/auto.sshfs /etc/auto.sshfs
-ln -s /usr/bin/auto.ftpfs /etc/auto.ftpfs
-ln -s /usr/bin/lufsd /sbin/mount.lufs
 depmod -aq
 
 exit 0

diff --git a/debian/postrm b/debian/postrm
index 9c8f899..6962af1 100755 (executable)
--- a/debian/postrm
+++ b/debian/postrm
@@ -18,8 +18,5 @@
 
 
 depmod -aq
-rm -f /etc/auto.sshfs
-rm -f /etc/auto.ftpfs
-rm -f /sbin/mount.lufs
 
 exit 0

diff --git a/debian/prerm b/debian/prerm
index 8223160..27cda4e 100755 (executable)
--- a/debian/prerm
+++ b/debian/prerm
@@ -19,5 +19,6 @@
 
 rmmod 2>/dev/null lufs
 rm -f /var/lib/lufs/*.o
+rm -f /var/lib/lufs/*.ko
 
 exit 0

diff --git a/lufs.spec.in b/lufs.spec.in
index 8e3dfde..c006248 100644 (file)
--- a/lufs.spec.in
+++ b/lufs.spec.in
@@ -60,20 +60,15 @@ rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 %post
-ln -s %{_bindir}/auto.sshfs /etc/auto.sshfs
-ln -s %{_bindir}/auto.ftpfs /etc/auto.ftpfs
-ln -s %{_bindir}/lufsd /sbin/mount.lufs
 depmod -aq
 
 %preun
 rmmod 2>/dev/null lufs
 rm -f %{_localstatedir}/lib/lufs/*.o
+rm -f %{_localstatedir}/lib/lufs/*.ko
 
 %postun
 depmod -aq
-rm -f /etc/auto.sshfs
-rm -f /etc/auto.ftpfs
-rm -f /sbin/mount.lufs
 
 # We need 'devel' files for kernel module compilation of the standard package.
 %files
@@ -94,6 +89,9 @@ rm -f /sbin/mount.lufs
 %{_libdir}/lib*.so*
 %{_mandir}/man*/lufs*
 %{_localstatedir}/lib/lufs
+/etc/auto.sshfs
+/etc/auto.ftpfs
+/sbin/mount.lufs
 # These are SUID root...
 %defattr(4755,root,root)
 %{_bindir}/lufsmnt-bin

diff --git a/lufsd/Makefile.am b/lufsd/Makefile.am
index 87fa9d5..de5b976 100644 (file)
--- a/lufsd/Makefile.am
+++ b/lufsd/Makefile.am
@@ -19,4 +19,5 @@ lufsd_LDFLAGS= -rdynamic -lpthread
 install-exec-hook:
        @echo "lufsd post install configuration..."
        $(mkinstalldirs) $(DESTDIR)/sbin
-       ln -fs $(DESTDIR)$(bindir)/lufsd $(DESTDIR)/sbin/mount.lufs
+       rm -f $(DESTDIR)/sbin/mount.lufs
+       ln -fs $(bindir)/lufsd $(DESTDIR)/sbin/mount.lufs

diff --git a/util/Makefile.am b/util/Makefile.am
index cf0144c..3bda941 100644 (file)
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -12,8 +12,10 @@ auto_ftpfs_SOURCES=auto.ftpfs.c
 install-exec-hook:
        @echo postinstall configuration
        $(mkinstalldirs) $(DESTDIR)/etc
-       ln -fs $(DESTDIR)$(bindir)/auto.sshfs $(DESTDIR)/etc/auto.sshfs
-       ln -fs $(DESTDIR)$(bindir)/auto.ftpfs $(DESTDIR)/etc/auto.ftpfs
+       rm -f $(DESTDIR)/etc/auto.sshfs
+       ln -fs $(bindir)/auto.sshfs $(DESTDIR)/etc/auto.sshfs
+       rm -f $(DESTDIR)/etc/auto.ftpfs
+       ln -fs $(bindir)/auto.ftpfs $(DESTDIR)/etc/auto.ftpfs
        if [ "$(LSUID)" -a -z "$(DESTDIR)" ]; then chmod a+s $(DESTDIR)$(bindir)/lufsmnt-bin $(DESTDIR)$(bindir)/lufsumount; fi
        if [ -f /etc/auto.master -a "$(AUTOFS_INSTALL)" -a ! "`cat $(DESTDIR)/etc/auto.master | grep \"auto.ftpfs\"`" ]; then mkdir -p $(DESTDIR)/mnt/net/ssh $(DESTDIR)/mnt/net/ftp; echo -e "/mnt/net/ssh\t/etc/auto.sshfs\t--timeout=60\n/mnt/net/ftp\t/etc/auto.ftpfs\t--timeout=60\n" >> $(DESTDIR)/etc/auto.master; $(DESTDIR)/etc/init.d/autofs restart; fi