diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2011-09-23 09:16:37 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-09-23 09:16:37 +0000 |
| commit | 7711090cdb7398428536b177e55cabea219258d5 (patch) | |
| tree | c344402294aa4d63574ca0970c1c1bdf332a83e7 | |
| parent | 59ea1c2b42e66c216243a22e9d4d22ed6a3b93f4 (diff) | |
| download | aports-7711090cdb7398428536b177e55cabea219258d5.tar.bz2 aports-7711090cdb7398428536b177e55cabea219258d5.tar.xz | |
main/udisk: fix mounting with busybox mount
busybox mount does not support the uhelper= mount option and util-linux
appears to just ignore it. Rather than adding code that does nothing
to busybox mount we just drop the uhelper=udisks from udisks side.
Reported upstream:
https://bugs.freedesktop.org/show_bug.cgi?id=41142
| -rw-r--r-- | main/udisks/APKBUILD | 6 | ||||
| -rw-r--r-- | main/udisks/udisks-uhelper.patch | 11 |
2 files changed, 15 insertions, 2 deletions
diff --git a/main/udisks/APKBUILD b/main/udisks/APKBUILD index ca55fbdbb..4366394b7 100644 --- a/main/udisks/APKBUILD +++ b/main/udisks/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=udisks pkgver=1.0.4 -pkgrel=0 +pkgrel=1 pkgdesc="Disk Management Service" url="http://www.freedesktop.org/wiki/Software/udisks" arch="all" @@ -14,6 +14,7 @@ makedepends="glib-dev polkit-dev parted-dev udev-dev sg3_utils-dev install= subpackages="$pkgname-dev $pkgname-doc" source="http://hal.freedesktop.org/releases/$pkgname-$pkgver.tar.gz + udisks-uhelper.patch " _builddir="$srcdir"/$pkgname-$pkgver @@ -47,4 +48,5 @@ package() { mv "$pkgdir"/usr/share/pkgconfig "$pkgdir"/usr/lib/ } -md5sums="86c63b2b5484f2060499a052b5b6256b udisks-1.0.4.tar.gz" +md5sums="86c63b2b5484f2060499a052b5b6256b udisks-1.0.4.tar.gz +8d522b2bf6e63c981ece6120f93cc201 udisks-uhelper.patch" diff --git a/main/udisks/udisks-uhelper.patch b/main/udisks/udisks-uhelper.patch new file mode 100644 index 000000000..b04d04836 --- /dev/null +++ b/main/udisks/udisks-uhelper.patch @@ -0,0 +1,11 @@ +--- ./src/device.c.orig ++++ ./src/device.c +@@ -6480,7 +6480,7 @@ + options = prepend_default_mount_options (device, fsmo, caller_uid, given_options); + + /* validate mount options and check for authorizations */ +- s = g_string_new ("uhelper=udisks,nodev,nosuid"); ++ s = g_string_new ("nodev,nosuid"); + for (n = 0; options[n] != NULL; n++) + { + const char *option = options[n]; |