diff --git a/srcpkgs/fuse/files/fuse.rc b/srcpkgs/fuse/files/fuse.rc deleted file mode 100644 index f524fc69e1..0000000000 --- a/srcpkgs/fuse/files/fuse.rc +++ /dev/null @@ -1,30 +0,0 @@ -#!/sbin/runscript - -FUSECTL_SYSFS=/sys/fs/fuse/connections - -depend() -{ - need localmount -} - -start() -{ - ebegin "Starting fuse" - if ! grep -qw fuse /proc/filesystems; then - modprobe fuse >/dev/null 2>&1 || eend $? - fi - if grep -qw fusectl /proc/filesystems && \ - ! grep -qw $FUSECTL_SYSFS /proc/mounts; then - mount -t fusectl none $FUSECTL_SYSFS >/dev/null 2>&1 || eend $? - fi - eend -} - -stop() -{ - ebegin "Stopping fuse" - if grep -qw $FUSECTL_SYSFS /proc/mounts; then - umount $FUSECTL_SYSFS >/dev/null 2>&1 || eend $? - fi - eend -} diff --git a/srcpkgs/fuse/template b/srcpkgs/fuse/template index 39c6cca978..1fa7f9706d 100644 --- a/srcpkgs/fuse/template +++ b/srcpkgs/fuse/template @@ -1,7 +1,7 @@ # Template file for 'fuse' pkgname=fuse version=2.8.5 -revision=1 +revision=2 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" build_style=gnu_configure configure_args="--enable-lib --enable-util --bindir=/bin" @@ -21,15 +21,10 @@ long_desc=" * Has proven very stable over time" subpackages="$pkgname-devel" -openrc_services="fuse default true" Add_dependency run glibc post_install() { # Remove static dev nodes. - rm -rf ${DESTDIR}/dev - - # Remove provided init script, we use our own. - rm -f ${DESTDIR}/etc/init.d/fuse - install -m755 ${FILESDIR}/fuse.rc ${DESTDIR}/etc/init.d/fuse + rm -rf ${DESTDIR}/dev ${DESTDIR}/etc/init.d }