Accepting request 51523 from filesystems

Accepted submit request 51523 from user mszeredi

OBS-URL: https://build.opensuse.org/request/show/51523
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fuse?expand=0&rev=33
This commit is contained in:
Ruediger Oertel 2010-10-28 11:16:31 +00:00 committed by Git OBS Bridge
commit 88178f6497
4 changed files with 10 additions and 101 deletions

View File

@ -1,74 +0,0 @@
#! /bin/sh
### BEGIN INIT INFO
# Provides: boot.fuse
# Required-Start:
# Should-Start: boot.udev $local_fs
# Required-Stop:
# Default-Start: B
# Default-Stop:
# Short-Description: Start and stop fuse.
# Description: Load the fuse module and mount the fuse control
# filesystem.
### END INIT INFO
PATH="/sbin:/bin"
MOUNTPOINT=/sys/fs/fuse/connections
. /etc/rc.status
case "$1" in
start|restart|force-reload)
if ! grep -qw fuse /proc/filesystems; then
echo -n "Loading fuse module "
if ! modprobe fuse >/dev/null 2>&1; then
rc_status -v
rc_exit
fi
else
echo -n "Fuse filesystem already available"
fi
rc_status -v
if grep -qw fusectl /proc/filesystems && \
! grep -qw $MOUNTPOINT /proc/mounts; then
echo -n "Mounting fuse control filesystem"
mount -t fusectl fusectl $MOUNTPOINT >/dev/null 2>&1
else
echo -n "Fuse control filesystem already available"
fi
rc_status -v
;;
stop)
if ! grep -qw fuse /proc/filesystems; then
echo -n "Fuse filesystem not loaded"
rc_failed 7
rc_status -v
rc_exit
fi
if grep -qw $MOUNTPOINT /proc/mounts; then
echo -n "Unmounting fuse control filesystem"
umount $MOUNTPOINT >/dev/null 2>&1
else
echo -n "Fuse control filesystem not mounted"
fi
rc_status -v
;;
reload)
echo -n "Reloading fuse filesystem"
rc_failed 3
rc_status -v
;;
status)
echo -n "Checking fuse filesystem"
rc_reset
if ! grep -qw fuse /proc/filesystems; then
rc_failed 3
fi
rc_status -v
;;
*)
echo "Usage: $0 {start|stop|restart|reload|force-reload|status}"
exit 1
;;
esac
rc_exit

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Oct 27 15:34:16 CEST 2010 - mszeredi@suse.cz
- Remove /etc/init.d/boot.fuse [bnc#648843]
-------------------------------------------------------------------
Tue Sep 28 11:52:41 CEST 2010 - mszeredi@suse.cz

View File

@ -11,14 +11,5 @@ from Config import *
#
addFilter("fuse non-remote_fs-dependency")
# rpmlint message:
# The init script name should be the same as the package name in lower case,
# one with 'd' appended if it invokes a process by that name.
#
# /etc/init.d/boot.fuse is fine, no daemon is started, just a module is
# loaded (and udev creates the device) and a kernel filesystem is mounted:
#
addFilter("fuse incoherent-init-script-name")
# Everything moved away, so it got small but the docs are not huge:
addFilter("fuse package-with-huge-docs")

View File

@ -24,9 +24,8 @@ Version: 2.8.5
Release: 1
License: GPLv2+ ; LGPLv2.1+
Group: System/Filesystems
# http://prdownloads.sourceforge.net/fuse/fuse-2.X/%{version}/fuse-%{version}.tar.gz
# http://sourceforge.net/projects/fuse/files/fuse-2.X/%%{version}/fuse-%%{version}.tar.gz/download
Source: %{name}-%{version}.tar.bz2
Source1: boot.fuse
Source2: fuse.rpmlintrc
Source3: baselibs.conf
Patch: fuse-install-fix.diff
@ -34,13 +33,13 @@ Patch2: fuse-pc-remove-libdir-from-Libs.diff
Url: http://fuse.sourceforge.net
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: licenses
BuildRequires: licenses
BuildRequires: licenses pkg-config
%if 0%{?suse_version}
%if 0%{?suse_version} >= 1000
Supplements: filesystem(fuse)
%endif
%endif
PreReq: %insserv_prereq permissions
PreReq: permissions
%description
With FUSE, a user space program can export a file system through the
@ -225,12 +224,11 @@ Authors:
%endif
%build
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
export CFLAGS="$RPM_OPT_FLAGS -g -fno-strict-aliasing"
%configure --with-pic \
--with-pkgconfigdir=%{_libdir}/pkgconfig \
--exec-prefix=/ \
--libdir=/%{_lib} \
--disable-kernel-module \
--enable-lib \
--enable-util \
--enable-example
@ -239,7 +237,6 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%install
make DESTDIR="$RPM_BUILD_ROOT" install
rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/init.d
install -m755 -D %{S:1} $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/boot.fuse
ln -sf /usr/share/doc/licenses/md5/$(md5sum COPYING | sed 's/ .*//') COPYING
ln -sf /usr/share/doc/licenses/md5/$(md5sum COPYING.LIB | sed 's/ .*//') COPYING.LIB
# Needed for OpenSUSE buildservice
@ -262,18 +259,9 @@ done
%{__rm} -rf example/.deps example/Makefile.am example/Makefile.in
%post
%{insserv_force_if_yast boot.fuse}
%run_permissions
%verifyscript
%verify_permissions -e %{usrbindir}/fusermount
%preun
if ! test -f /.buildenv ; then
%stop_on_removal boot.fuse
fi
%postun
%insserv_cleanup
%verify_permissions -e %{_bindir}/fusermount
%post -n libfuse2 -p /sbin/ldconfig
@ -284,7 +272,6 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%config %{_sysconfdir}/init.d/boot.fuse
%doc AUTHORS ChangeLog FAQ NEWS README* COPYING*
%if %suse_version <= 1020
%dir %{_sysconfdir}/udev