From a5110d6031ecd5343114d74d2b463234342c12a0 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Wed, 22 Jan 2020 19:46:20 -0500 Subject: meta-agl-profile-core: switch to udisks2 The udisks recipe was dropped from meta-oe in zeus, rework our bbappend to work with udisks2 which replaces it. Bug-AGL: SPEC-2932 Change-Id: I9ac1a25ee5a816d06874a5c859034f2c2758d117 Signed-off-by: Scott Murray --- .../recipes-support/udisks/files/automount.service | 2 +- .../udisks/files/org.freedesktop.UDisks.conf | 32 ---------------------- .../recipes-support/udisks/files/udisks.service | 11 -------- 3 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 meta-agl-profile-core/recipes-support/udisks/files/org.freedesktop.UDisks.conf delete mode 100644 meta-agl-profile-core/recipes-support/udisks/files/udisks.service (limited to 'meta-agl-profile-core/recipes-support/udisks/files') diff --git a/meta-agl-profile-core/recipes-support/udisks/files/automount.service b/meta-agl-profile-core/recipes-support/udisks/files/automount.service index 64c36e76b..b16515196 100644 --- a/meta-agl-profile-core/recipes-support/udisks/files/automount.service +++ b/meta-agl-profile-core/recipes-support/udisks/files/automount.service @@ -1,6 +1,6 @@ [Unit] Description=Automount Disk Manager -After=udisks.service +After=udisks2.service [Service] ExecStart=/usr/libexec/automount.sh diff --git a/meta-agl-profile-core/recipes-support/udisks/files/org.freedesktop.UDisks.conf b/meta-agl-profile-core/recipes-support/udisks/files/org.freedesktop.UDisks.conf deleted file mode 100644 index 0098b94e1..000000000 --- a/meta-agl-profile-core/recipes-support/udisks/files/org.freedesktop.UDisks.conf +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/meta-agl-profile-core/recipes-support/udisks/files/udisks.service b/meta-agl-profile-core/recipes-support/udisks/files/udisks.service deleted file mode 100644 index 4bd558449..000000000 --- a/meta-agl-profile-core/recipes-support/udisks/files/udisks.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Disk Manager (legacy version) -Documentation=man:udisks(7) - -[Service] -Type=dbus -BusName=org.freedesktop.UDisks -ExecStart=/usr/libexec/udisks-daemon --no-debug - -[Install] -WantedBy=multi-user.target -- cgit 1.2.3-korg From e32b0ddf6130dc5b62f86f1f588e6d1fa3b2d07a Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Tue, 11 Feb 2020 16:44:22 -0500 Subject: meta-agl-profile-core: tweak udisks2 configuration for AGL Per discussion on Arch wiki at: https://wiki.archlinux.org/index.php/Udisks#Mount_to_/media_(udisks2) add a udev rules file to tweak the UDISKS_FILESYSTEM_SHARED environment variable to configure udisks2 to use /media as used to be the default with the older udisks. This restores behavior to what is expected by the AGL configuration for lightmediascanner. Bug-AGL: SPEC-2932 Change-Id: I66fda10f71dea889f3cd06341d9daa809bec2aa5 Signed-off-by: Scott Murray --- meta-agl-profile-core/recipes-support/udisks/files/99-udisks2.rules | 5 +++++ meta-agl-profile-core/recipes-support/udisks/udisks2_%.bbappend | 4 ++++ 2 files changed, 9 insertions(+) create mode 100644 meta-agl-profile-core/recipes-support/udisks/files/99-udisks2.rules (limited to 'meta-agl-profile-core/recipes-support/udisks/files') diff --git a/meta-agl-profile-core/recipes-support/udisks/files/99-udisks2.rules b/meta-agl-profile-core/recipes-support/udisks/files/99-udisks2.rules new file mode 100644 index 000000000..996e43439 --- /dev/null +++ b/meta-agl-profile-core/recipes-support/udisks/files/99-udisks2.rules @@ -0,0 +1,5 @@ +# UDISKS_FILESYSTEM_SHARED +# ==1: mount filesystem to a shared directory (/media/VolumeName) +# ==0: mount filesystem to a private directory (/run/media/$USER/VolumeName) +# See udisks(8) +ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{UDISKS_FILESYSTEM_SHARED}="1" diff --git a/meta-agl-profile-core/recipes-support/udisks/udisks2_%.bbappend b/meta-agl-profile-core/recipes-support/udisks/udisks2_%.bbappend index 27cac6592..34756f480 100644 --- a/meta-agl-profile-core/recipes-support/udisks/udisks2_%.bbappend +++ b/meta-agl-profile-core/recipes-support/udisks/udisks2_%.bbappend @@ -2,6 +2,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:" SRC_URI += "file://automount.service \ file://automount.sh \ + file://99-udisks2.rules \ " SYSTEMD_AUTO_ENABLE = "enable" @@ -15,6 +16,9 @@ do_install_append () { install -d ${D}${libexecdir} install -m 0755 ${WORKDIR}/automount.sh ${D}${libexecdir}/automount.sh + + install -d ${D}${sysconfdir}/udev/rules.d + install -m 0644 ${WORKDIR}/99-udisks2.rules ${D}${sysconfdir}/udev/rules.d } FILES_${PN} += "${base_libdir}/systemd/system/automount.service \ -- cgit 1.2.3-korg