-
Committer:
Bazaar Package Importer
-
Author(s):
Martin Pitt
-
Date:
2008-11-14 13:58:50 UTC
-
mfrom:
(1.1.12 upstream)
(2.1.1 lenny)
-
Revision ID:
james.westby@ubuntu.com-20081114135850-leq7t27q6bt4v6jj
Tags: 2.7.4-1.1ubuntu1
* Merge with Debian unstable. Remaining Ubuntu changes:
- Use udev rules instead of init script:
+ Add debian/45-fuse.rules: Put /dev/fuse into group fuse.
+ Add debian/fuse-utils.modprobe: Mount/Umount fusectl fs on module
loading/unloading.
+ debian/fuse-utils.postinst: Load fuse module and add it to
/etc/modules, so that it is loaded at boot time.
+ debian/rules, debian/fuse-utils.install: Don't install the init
script; install the udev rule and the module configuration file instead.
+ (Not forwarded to Debian; lots of effort for a questionably small boot
speed improvement, and will be obsolete with proper upstart scripts.)
- debian/fuse-utils.install: Install ulockmgr_server.
- debian/fuse-utils.postinst: Don't fail if udev is running and /dev/fuse
does not exist. (Forwarded to Debian #505685)
- debian/{rules,libfuse2.install,fuse-utils.lintian}: Move fusermount and
ulockmgr_server to /bin and associated libraries to /lib. This allows
mounting ntfs filesystems in /etc/fstab. (Debian #452412)
- Create libfuse2-udeb and fuse-utils-udeb. (Forwarded to Debian #505697)
- initramfs support, for booting from ntfs-3g in wubi:
+ debian/fuse-utils.initramfs-hook: Copy /sbin/mount.fuse and the fuse
kernel module into the initramfs.
+ debian/rules: Install above file into fuse-utils.
+ debian/fuse-utils.postinst: Call update-initramfs.
+ (Forwarded to Debian #505691)
- Dynamic foreground user access: (Ubuntu specific until Debian uses
ACL-enabled hal)
+ debian/fuse-utils.postinst: Keep /bin/fusermount as world executable.
It already bails out correctly if the user does not have access to
/dev/fuse; no reason to control access to it in two different places,
and the permissions of the binary can't be changed in a flexible way.
+ Add debian/10-fuse-permissions.fdi: Enable hal's dynamic ACL
management for /dev/fuse, so that local foreground consoles will have
access to it.
+ debian/fuse-utils.install: Install FDI.