Replace plpnfsd with plpfuse.

Other minor simplifications to the build system.

3 files changed, 6 insertions, 46 deletions

diff --git a/etc/plptools.spec.in b/etc/plptools.spec.in
index 555c5e3..03f204f 100644
--- a/etc/plptools.spec.in
+++ b/etc/plptools.spec.in
@@ -171,8 +171,8 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 cat>$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/psion<<EOF
 START_NCPD=yes
 NCPD_ARGS=
-START_PLPNFSD=no
-PLPNFSD_ARGS=
+START_PLPFUSE=no
+PLPFUSE_ARGS=
 START_PLPPRINTD=yes
 PLPPRINTD_ARGS=
 EOF
@@ -184,8 +184,8 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 cat>$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/psion<<EOF
 START_NCPD=yes
 NCPD_ARGS=
-START_PLPNFSD=no
-PLPNFSD_ARGS=
+START_PLPFUSE=no
+PLPFUSE_ARGS=
 START_PLPPRINTD=yes
 PLPPRINTD_ARGS=
 EOF
diff --git a/etc/psion.SuSE.in b/etc/psion.SuSE.in
index 3c52cd6..c41e9ab 100755
--- a/etc/psion.SuSE.in
+++ b/etc/psion.SuSE.in
@@ -13,7 +13,6 @@
 . /etc/rc.status
 
 [ -f @prefix@/sbin/ncpd ] || exit 0
-[ -f @prefix@/sbin/plpnfsd ] || exit 0
 [ -f @prefix@/sbin/plpprintd ] || exit 0
 [ -f /etc/sysconfig/psion ] || exit 0
 . /etc/sysconfig/psion
@@ -27,11 +26,6 @@ start() {
 		startproc -f @prefix@/sbin/ncpd $NCPD_ARGS
 		rc_status -v
 	fi
-	if [ "$START_PLPNFSD" = "yes" ] ; then
-		echo -n "  plpnfsd: "
-		startproc -f @prefix@/sbin/plpnfsd $PLPNFSD_ARGS
-		rc_status -v
-	fi
 	if [ "$START_PLPPRINTD" = "yes" ] ; then
 		echo -n "  plpprintd: "
 		startproc -f @prefix@/sbin/plpprintd $PLPPRINTD_ARGS
@@ -42,19 +36,6 @@ start() {
 
 stop() {
 	echo "Stopping Psion support ..."
-	if [ "$START_PLPNFSD" = "yes" ] ; then
-		echo -n "  plpnfsd: "
-		killproc -HUP @prefix@/sbin/plpnfsd
-		WAIT=5
-		while test $WAIT -gt 0 ; do
-			test -z "`pidofproc plpnfsd`" && break;
-			sleep 1 # allow plpnfsd flushing it's cache
-			WAIT=`expr $WAIT - 1`
-		done
-		test -z "`pidofproc plpnfsd`" || \
-			killproc -TERM @prefix@/sbin/plpnfsd
-		rc_status -v
-	fi
 	if [ "$START_PLPPRINTD" = "yes" ] ; then
 		echo -n "  plpprintd: "
 		killproc -TERM @prefix@/sbin/plpprintd
@@ -83,8 +64,7 @@ case "$1" in
 	;;
   status)
 	echo -n "Checking for service psion: "
-	checkproc @prefix@/sbin/plpnfsd && \
-		checkproc @prefix@/sbin/plpprintd && \
+	checkproc @prefix@/sbin/plpprintd && \
 		checkproc @prefix@/sbin/ncpd
 	rc_status -v
 	;;
diff --git a/etc/psion.in b/etc/psion.in
index fa807f7..57a5c57 100755
--- a/etc/psion.in
+++ b/etc/psion.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# psion        Starts ncpd/plpnfsd.
+# psion        Starts ncpd/plpfuse.
 #
 # chkconfig: 2345 45 10
 # description: This facility enables connectivity to a Psion series 5.
@@ -9,7 +9,6 @@
 . /etc/rc.d/init.d/functions
 
 [ -f @prefix@/sbin/ncpd ] || exit 0
-[ -f @prefix@/sbin/plpnfsd ] || exit 0
 [ -f @prefix@/sbin/plpprintd ] || exit 0
 [ -f /etc/sysconfig/psion ] || exit 0
 . /etc/sysconfig/psion
@@ -24,12 +23,6 @@ start() {
 		echo
 	fi
 	if [ $RETVAL -eq 0 ] ; then
-		if test "$START_PLPNFSD" = "yes" ; then
-			echo -n "  plpnfsd: "
-			daemon @prefix@/sbin/plpnfsd $PLPNFSD_ARGS
-			RETVAL=$?
-			echo
-		fi
 		if test "$START_PLPPRINTD" = "yes" ; then
 			echo -n "  plpprintd: "
 			daemon @prefix@/sbin/plpprintd $PLPPRINTD_ARGS
@@ -44,18 +37,6 @@ start() {
 stop() {
 	echo "Stopping Psion support ..."
 	RETVAL=0
-	if test "$START_PLPNFSD" = "yes" ; then
-		echo -n "  plpnfsd: "
-		killproc plpnfsd -HUP
-		WAIT=5
-		while test $WAIT -gt 0 ; do
-			test -z "`pidofproc plpnfsd`" && break;
-			sleep 1 # allow plpnfsd flushing it's cache
-			WAIT=`expr $WAIT - 1`
-		done
-		test -z "`pidofproc plpnfsd`" || killproc plpnfsd
-		echo
-	fi
 	if test "$START_PLPPRINTD" = "yes" ; then
 		echo -n "  plpprintd: "
 		killproc plpprintd
@@ -86,7 +67,6 @@ case "$1" in
 	;;
   status)
 	status ncpd
-	status plpnfsd
 	status plpprintd
 	;;
   restart|reload)