tag 634328 patch
thanks
plptools indeed required fusermount, here's a patch to make fusermount
only necessary on GNU/Linux.
My patch also fixes another linuxism (code to handle module load) and
makes the package buildable only on kernels with FUSE support.
--
Robert Millan
=== modified file 'debian/control'
--- debian/control 2011-11-26 12:11:20 +0000
+++ debian/control 2011-11-26 12:21:42 +0000
@@ -6,8 +6,8 @@ Maintainer: John Lines <j...@paladyn.org
Standards-Version: 3.8.3
Package: plptools
-Architecture: any
-Depends: ${shlibs:Depends},${misc:Depends},fuse-utils
+Architecture: linux-any kfreebsd-any
+Depends: ${shlibs:Depends},${misc:Depends}, fuse [linux-any] | fuse4bsd [kfreebsd-any]
Conflicts: klipsi, plptools-kde, kpsion
Provides: libplpc2a
Replaces: libplpc2a
@@ -25,7 +25,7 @@ Description: Access EPOC device (Psion P
Version 1.0 and later no longer provide specific KDE integration.
Package: plptools-dev
-Architecture: any
+Architecture: linux-any kfreebsd-any
Section: devel
Depends: plptools (= ${binary:Version}),${misc:Depends}
Homepage: http://plptools.sourceforge.net/
=== modified file 'debian/plptools.init'
--- debian/plptools.init 2011-11-26 12:11:20 +0000
+++ debian/plptools.init 2011-11-26 12:20:20 +0000
@@ -1,8 +1,8 @@
#! /bin/sh
### BEGIN INIT INFO
# Provides: plptools
-# Required-Start: $remote_fs $syslog
-# Required-Stop: $remote_fs $syslog
+# Required-Start: $remote_fs $syslog fuse
+# Required-Stop: $remote_fs $syslog fuse
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: start or stop the plptools daemons
@@ -37,9 +37,6 @@ case "$1" in
fi
if test "$START_PLPFUSE" = "yes" ; then
echo -n "Starting $DESC ($DAEMON2): "
- if ! grep -q fuse /proc/filesystems; then
- modprobe fuse
- fi
start-stop-daemon --start --quiet \
--exec $DAEMON2 -- $PLPFUSE_ARGS $MOUNTPOINT && \
echo -n "done" || echo -n "failed"
@@ -56,7 +53,14 @@ case "$1" in
stop)
if test "$START_PLPFUSE" = "yes" ; then
echo -n "Stopping $DESC ($DAEMON2): "
- fusermount -z -u $MOUNTPOINT || true
+ if [ "$(uname)" = Linux ]; then
+ fusermount -z -u $MOUNTPOINT || true
+ elif [ "$(uname)" = GNU/kFreeBSD ]; then
+ umount $MOUNTPOINT || true
+ else
+ echo "Port me" >&2
+ exit 1
+ fi
start-stop-daemon --stop --retry HUP/5/TERM/1 --quiet \
--exec $DAEMON2 && \
echo -n "done" || echo -n "already stopped"
