'prepmod'-wrap 'lufsd' instead of 'lufsmnt' as 'prepmod' fail is safe this way.

diff --git a/kernel/Linux/Makefile.am b/kernel/Linux/Makefile.am
index 495c523..8bb6e5f 100644 (file)
--- a/kernel/Linux/Makefile.am
+++ b/kernel/Linux/Makefile.am
@@ -10,5 +10,5 @@ install-exec-hook:
        $(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/lufs
        $(mkinstalldirs) $(DESTDIR)$(bindir)
        $(RM) $(DESTDIR)$(bindir)/lufsmnt
-       $(LN_S) $(basedir)/prepmod $(DESTDIR)$(bindir)/lufsmnt
+       $(LN_S) $(basedir)/prepmod $(DESTDIR)$(bindir)/lufsd
 

diff --git a/kernel/Linux/prepmod.in b/kernel/Linux/prepmod.in
index f5ed430..3d62d37 100755 (executable)
--- a/kernel/Linux/prepmod.in
+++ b/kernel/Linux/prepmod.in
@@ -42,12 +42,12 @@ $kernel_gcc_args="";
 
 sub modext { my($uname_r)=@_; ($uname_r lt "2.5" ? "o" : "ko"); }
 
-my $lufsmnt_bin;
-if ($0 eq "lufsmnt" || $0=~m#/lufsmnt$#) {
+my $lufsd_bin;
+if ($0 eq "lufsd" || $0=~m#/lufsd$#) {
        $quiet=1;
-       $lufsmnt_bin='@bindir@/lufsmnt-bin';
-       $lufsmnt_bin=~s#\$\Q{exec_prefix}\E#'@exec_prefix@';#ge;
-       $lufsmnt_bin=~s#\$\Q{prefix}\E#'@prefix@';#ge;
+       $lufsd_bin='@bindir@/lufsd-bin';
+       $lufsd_bin=~s#\$\Q{exec_prefix}\E#'@exec_prefix@';#ge;
+       $lufsd_bin=~s#\$\Q{prefix}\E#'@prefix@';#ge;
        }
 else {
        die if !GetOptions(
@@ -100,9 +100,9 @@ my($load)=@_;
                do { ($modproberc=_system $_) and cluck "$_ failed - ignoring"; }
                                for ("/sbin/depmod -aq","/sbin/modprobe lufs");
                }
-       exit ($modproberc ? 1 : 0) if !$lufsmnt_bin;
-       do { exec $lufsmnt_bin,@ARGV; };
-       confess "Failed to exec '$lufsmnt_bin': $!";
+       exit ($modproberc ? 1 : 0) if !$lufsd_bin;
+       do { exec $lufsd_bin,@ARGV; };
+       confess "Failed to exec '$lufsd_bin': $!";
 }
 
 

diff --git a/lufs.spec.in b/lufs.spec.in
index c006248..b6f4336 100644 (file)
--- a/lufs.spec.in
+++ b/lufs.spec.in
@@ -81,9 +81,9 @@ depmod -aq
 %{_libdir}/lib*.la
 %defattr(755,root,root)
 %{_bindir}/lufsd
+%{_bindir}/lufsd-bin
 %{_bindir}/lussh
 %{_bindir}/lufsmount
-%{_bindir}/lufsmnt
 %{_bindir}/auto.sshfs
 %{_bindir}/auto.ftpfs
 %{_libdir}/lib*.so*
@@ -94,7 +94,7 @@ depmod -aq
 /sbin/mount.lufs
 # These are SUID root...
 %defattr(4755,root,root)
-%{_bindir}/lufsmnt-bin
+%{_bindir}/lufsmnt
 %{_bindir}/lufsumount
 
 %changelog

diff --git a/lufsd/Makefile.am b/lufsd/Makefile.am
index de5b976..805417e 100644 (file)
--- a/lufsd/Makefile.am
+++ b/lufsd/Makefile.am
@@ -5,16 +5,16 @@ EXTRA_DIST=lussh lufsd.conf
 configdir=/etc
 config_DATA=lufsd.conf
 
-bin_PROGRAMS=lufsd
+bin_PROGRAMS=lufsd-bin
 bin_SCRIPTS=lussh
 
 noinst_HEADERS=message.h fsctl.h filesystem.h dircache.h list.h
 
-lufsd_SOURCES=daemon.c message.c fsctl.c filesystem.c dircache.c options.c
+lufsd_bin_SOURCES=daemon.c message.c fsctl.c filesystem.c dircache.c options.c
 
-lufsd_LDADD= -ldl @GVFS_LDADD@
-# Disabled by Captive: lufsd_LDADD+= -lstdc++
-lufsd_LDFLAGS= -rdynamic -lpthread
+lufsd_bin_LDADD= -ldl @GVFS_LDADD@
+# Disabled by Captive: lufsd_bin_LDADD+= -lstdc++
+lufsd_bin_LDFLAGS= -rdynamic -lpthread
 
 install-exec-hook:
        @echo "lufsd post install configuration..."

diff --git a/util/Makefile.am b/util/Makefile.am
index 3bda941..5d54990 100644 (file)
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -1,11 +1,11 @@
 INCLUDES=-I../
 LSUID:= @LUFS_SUID@
 
-bin_PROGRAMS=lufsmount lufsumount lufsmnt-bin auto.sshfs auto.ftpfs
+bin_PROGRAMS=lufsmount lufsumount lufsmnt auto.sshfs auto.ftpfs
 
 lufsmount_SOURCES=lufsmount.c
 lufsumount_SOURCES=lufsumount.c
-lufsmnt_bin_SOURCES=lufsmnt.c
+lufsmnt_SOURCES=lufsmnt.c
 auto_sshfs_SOURCES=auto.sshfs.c
 auto_ftpfs_SOURCES=auto.ftpfs.c
 
@@ -16,6 +16,6 @@ install-exec-hook:
        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 [ "$(LSUID)" -a -z "$(DESTDIR)" ]; then chmod a+s $(DESTDIR)$(bindir)/lufsmnt $(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