udisks: various fixes from Arch.
This commit is contained in:
parent
1d64034a2c
commit
9022ec3c63
3 changed files with 34 additions and 5 deletions
|
@ -1,12 +1,10 @@
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Disk Manager
|
Description=Disk Manager
|
||||||
After=syslog.target
|
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=dbus
|
Type=dbus
|
||||||
BusName=org.freedesktop.UDisks
|
BusName=org.freedesktop.UDisks
|
||||||
ExecStart=/usr/libexec/udisks-daemon
|
ExecStart=/usr/libexec/udisks-daemon
|
||||||
StandardOutput=syslog
|
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=graphical.target
|
WantedBy=graphical.target
|
||||||
|
|
28
srcpkgs/udisks/patches/drop-pci-db.patch
Normal file
28
srcpkgs/udisks/patches/drop-pci-db.patch
Normal file
|
@ -0,0 +1,28 @@
|
||||||
|
commit c73b5ab54378ec6d7df9948c46ce87f98587af9a
|
||||||
|
Author: Tom Gundersen <teg@jklm.no>
|
||||||
|
Date: 2 days ago
|
||||||
|
|
||||||
|
udev: remove redundant call to deprecated pci-db
|
||||||
|
|
||||||
|
The binary is no longer shipped with systemd/udev. The functionality
|
||||||
|
is taken over by a builtin, which is ran for all devices, rendering
|
||||||
|
this rule superfluous.
|
||||||
|
|
||||||
|
Cc: Jan de Groot <jgc@archlinux.org>
|
||||||
|
Signed-off-by: Tom Gundersen <teg@jklm.no>
|
||||||
|
|
||||||
|
diff --git a/data/80-udisks.rules b/data/80-udisks.rules
|
||||||
|
index d1c8c5d..4bf2b37 100644
|
||||||
|
--- data/80-udisks.rules
|
||||||
|
+++ data/80-udisks.rules
|
||||||
|
@@ -1,10 +1,6 @@
|
||||||
|
# Do not edit this file, it will be overwritten on updates
|
||||||
|
#
|
||||||
|
|
||||||
|
-# import names for PCI storage controllers
|
||||||
|
-#
|
||||||
|
-SUBSYSTEM=="pci", ACTION=="add|change", ENV{ID_MODEL_FROM_DATABASE}=="", ATTR{class}=="0x01*", IMPORT{program}="pci-db %p"
|
||||||
|
-
|
||||||
|
# Set eSATA port type for known eSATA CardBus adapters - first we want to ensure
|
||||||
|
# the device is on a cardbus controller (upper PCI device) - then we check
|
||||||
|
# vid/pid (lower PCI device)
|
|
@ -1,11 +1,11 @@
|
||||||
# Template file for 'udisks'
|
# Template file for 'udisks'
|
||||||
pkgname=udisks
|
pkgname=udisks
|
||||||
version=1.0.4
|
version=1.0.4
|
||||||
revision=11
|
revision=12
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--disable-static --enable-lvm2"
|
configure_args="--disable-static --enable-lvm2"
|
||||||
hostmakedepends="pkg-config intltool libxslt docbook-xsl"
|
hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel"
|
||||||
makedepends="glib-devel device-mapper-devel
|
makedepends="libglib-devel device-mapper-devel
|
||||||
liblvm2app-devel libparted-devel libatasmart-devel polkit-devel
|
liblvm2app-devel libparted-devel libatasmart-devel polkit-devel
|
||||||
dbus-glib-devel libgudev-devel>=183 sg3_utils-devel"
|
dbus-glib-devel libgudev-devel>=183 sg3_utils-devel"
|
||||||
short_desc="Disk Management Service"
|
short_desc="Disk Management Service"
|
||||||
|
@ -35,6 +35,9 @@ post_install() {
|
||||||
vmkdir usr/share/bash-completion/completions
|
vmkdir usr/share/bash-completion/completions
|
||||||
mv ${DESTDIR}/etc/profile.d/udisks-bash-completion.sh \
|
mv ${DESTDIR}/etc/profile.d/udisks-bash-completion.sh \
|
||||||
${DESTDIR}/usr/share/bash-completion/completions/udisks
|
${DESTDIR}/usr/share/bash-completion/completions/udisks
|
||||||
|
|
||||||
|
echo "SystemdService=udisks.service" \
|
||||||
|
>> ${DESTDIR}/usr/share/dbus-1/system-services/org.freedesktop.UDisks.service
|
||||||
}
|
}
|
||||||
|
|
||||||
udisks_package() {
|
udisks_package() {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue