merge with latest dev version

14 files changed, 223 insertions, 0 deletions

diff --git a/core/modules/udisks/data/usr/share/polkit-1/rules.d/10-drives.rules b/core/modules/udisks/data/usr/share/polkit-1/rules.d/10-drives.rules
new file mode 100644
index 00000000..72c4fb16
--- /dev/null
+++ b/core/modules/udisks/data/usr/share/polkit-1/rules.d/10-drives.rules
@@ -0,0 +1,6 @@
+polkit.addRule(function(action, subject) {
+	if (action.id.indexOf("org.freedesktop.udisks") == 0) { 
+		return polkit.Result.YES;
+	}
+});
+
diff --git a/core/modules/udisks/module.build b/core/modules/udisks/module.build
new file mode 100644
index 00000000..fb68512c
--- /dev/null
+++ b/core/modules/udisks/module.build
@@ -0,0 +1,50 @@
+
+fetch_source () {
+	:
+}
+
+build () {
+	COPYLIST="list_dpkg_output"
+	rm -f "$COPYLIST"
+
+	list_packet_files >> "$COPYLIST"
+	tarcopy "$(cat "$COPYLIST" | sort -u)" "$MODULE_BUILD_DIR"
+	mkdir -p "$MODULE_BUILD_DIR/etc/systemd/system/basic.target.wants" "$MODULE_BUILD_DIR/usr/share/dbus-1/system-services"
+	local FOUND=no
+	local BINARY=$(find "$MODULE_BUILD_DIR" -name udisksd -executable | head -n 1)
+	[ -z "$BINARY" ] && BINARY=$(find "$MODULE_BUILD_DIR" -name udisks2d -executable | head -n 1)
+	[ -z "$BINARY" ] && BINARY=$(find "$MODULE_BUILD_DIR" -name udisksd2 -executable | head -n 1)
+	VER=none
+	if [ -n "$BINARY" ]; then
+		VER=udisks
+		[[ "$BINARY" == *udisks2* || -d "$MODULE_BUILD_DIR/usr/lib/udisks2" ]] && VER=udisks2
+		create_udisks_service "$VER" "$BINARY"
+		FOUND=yes
+	fi
+	if [ "$VER" != "udisks" ]; then
+		BINARY=$(find "$MODULE_BUILD_DIR" -name udisks-daemon -executable | head -n 1)
+		[ "$VER" == "none" -a -z "$BINARY" ] && perror "Could not determine the udisks(1/2) daemon binary from inspecting $MODULE_BUILD_DIR"
+		[ -n "$BINARY" ] && create_udisks_service "udisks" "$BINARY"
+	fi
+}
+
+post_copy () {
+	:
+}
+
+create_udisks_service () {
+	[ $# -ne 2 ] && perror "Call create_udisks_service with TWO params!"
+	local BINARY="/${2#$MODULE_BUILD_DIR}"
+	if [ "$1" == "udisks2" ]; then
+		# assume udisks v2
+		sed "s,%UDISKSD%,$BINARY,g" ${MODULE_DIR}/templates/udisks2.systemd.service > "$MODULE_BUILD_DIR/etc/systemd/system/udisks2.service" || perror "Error creating systemd service for udisks2 $BINARY"
+		sed "s,%UDISKSD%,$BINARY,g" ${MODULE_DIR}/templates/udisks2.dbus.service > "$MODULE_BUILD_DIR/usr/share/dbus-1/system-services/org.freedesktop.UDisks2.service" || perror "Error creating dbus service for udisks2"
+		ln -s "../udisks2.service" "$MODULE_BUILD_DIR/etc/systemd/system/basic.target.wants/udisks2.service"
+	else
+		# assume udisks v1
+		sed "s,%UDISKSD%,$BINARY,g" ${MODULE_DIR}/templates/udisks.systemd.service > "$MODULE_BUILD_DIR/etc/systemd/system/udisks.service" || perror "Error creating systemd service for udisks $BINARY"
+		sed "s,%UDISKSD%,$BINARY,g" ${MODULE_DIR}/templates/udisks.dbus.service > "$MODULE_BUILD_DIR/usr/share/dbus-1/system-services/org.freedesktop.UDisks.service" || perror "Error creating dbus service for udisks"
+		ln -s "../udisks.service" "$MODULE_BUILD_DIR/etc/systemd/system/basic.target.wants/udisks.service"
+	fi
+}
+
diff --git a/core/modules/udisks/module.conf b/core/modules/udisks/module.conf
new file mode 100644
index 00000000..8ef6f29c
--- /dev/null
+++ b/core/modules/udisks/module.conf
@@ -0,0 +1,14 @@
+# This module is a little special, as it's supposed to be compatible
+# with udisks 1 and 2. suse 12.3 and ubuntu 13.04 use udisks2, ubuntu 12.04
+# uses udisks1. The build script looks a little hacky
+REQUIRED_DIRECTORIES="
+	/etc/dbus-1
+	/usr/lib/udev/rules.d
+	/usr/share/dbus-1
+	/usr/share/polkit-1
+	/etc/systemd/system
+"
+REQUIRED_BINARIES="
+	udisksd
+"
+
diff --git a/core/modules/udisks/module.conf.debian b/core/modules/udisks/module.conf.debian
new file mode 100644
index 00000000..c32a5f24
--- /dev/null
+++ b/core/modules/udisks/module.conf.debian
@@ -0,0 +1,32 @@
+REQUIRED_INSTALLED_PACKAGES="
+	udisks
+"
+REQUIRED_CONTENT_PACKAGES="
+	udisks
+"
+# Override: Only udisks1 is available
+REQUIRED_BINARIES="
+	udisks-helper-linux-md-check
+	udisks-daemon
+	udisks-helper-change-luks-password
+	udisks-helper-create-partition-table
+	udisks-helper-mdadm-expand
+	udisks-helper-drive-benchmark
+	udisks-helper-drive-detach
+	udisks-helper-mkfs
+	udisks-helper-ata-smart-collect
+	udisks-helper-change-filesystem-label
+	udisks-helper-modify-partition
+	udisks-helper-delete-partition
+	udisks-helper-create-partition
+	udisks-helper-fstab-mounter
+	udisks-helper-linux-md-remove-component
+	udisks-helper-ata-smart-selftest
+	udisks-helper-drive-poll
+	udisks-dm-export
+	udisks-lvm-pv-export
+	udisks-part-id
+	udisks-probe-ata-smart
+	udisks-probe-sas-expander
+"
+
diff --git a/core/modules/udisks/module.conf.fedora b/core/modules/udisks/module.conf.fedora
new file mode 100644
index 00000000..abf12be7
--- /dev/null
+++ b/core/modules/udisks/module.conf.fedora
@@ -0,0 +1,7 @@
+REQUIRED_INSTALLED_PACKAGES="
+	udisks2
+"
+REQUIRED_CONTENT_PACKAGES="
+	udisks2
+"
+
diff --git a/core/modules/udisks/module.conf.opensuse b/core/modules/udisks/module.conf.opensuse
new file mode 100644
index 00000000..abf12be7
--- /dev/null
+++ b/core/modules/udisks/module.conf.opensuse
@@ -0,0 +1,7 @@
+REQUIRED_INSTALLED_PACKAGES="
+	udisks2
+"
+REQUIRED_CONTENT_PACKAGES="
+	udisks2
+"
+
diff --git a/core/modules/udisks/module.conf.ubuntu b/core/modules/udisks/module.conf.ubuntu
new file mode 100644
index 00000000..3d127619
--- /dev/null
+++ b/core/modules/udisks/module.conf.ubuntu
@@ -0,0 +1,34 @@
+REQUIRED_INSTALLED_PACKAGES="
+	udisks
+	udisks2
+"
+REQUIRED_CONTENT_PACKAGES="
+	udisks
+	udisks2
+"
+# Add these for udisks 1 (required by kde)
+REQUIRED_BINARIES+="
+	udisks-helper-linux-md-check
+	udisks-daemon
+	udisks-helper-change-luks-password
+	udisks-helper-create-partition-table
+	udisks-helper-mdadm-expand
+	udisks-helper-drive-benchmark
+	udisks-helper-drive-detach
+	udisks-helper-mkfs
+	udisks-helper-ata-smart-collect
+	udisks-helper-change-filesystem-label
+	udisks-helper-modify-partition
+	udisks-helper-delete-partition
+	udisks-helper-create-partition
+	udisks-helper-fstab-mounter
+	udisks-helper-linux-md-remove-component
+	udisks-helper-ata-smart-selftest
+	udisks-helper-drive-poll
+	udisks-dm-export
+	udisks-lvm-pv-export
+	udisks-part-id
+	udisks-probe-ata-smart
+	udisks-probe-sas-expander
+"
+
diff --git a/core/modules/udisks/module.conf.ubuntu.12 b/core/modules/udisks/module.conf.ubuntu.12
new file mode 100644
index 00000000..b962ec65
--- /dev/null
+++ b/core/modules/udisks/module.conf.ubuntu.12
@@ -0,0 +1,31 @@
+REQUIRED_INSTALLED_PACKAGES="
+	udisks
+"
+REQUIRED_CONTENT_PACKAGES="
+	udisks
+"
+REQUIRED_BINARIES="
+	udisks-helper-linux-md-check
+	udisks-daemon
+	udisks-helper-change-luks-password
+	udisks-helper-create-partition-table
+	udisks-helper-mdadm-expand
+	udisks-helper-drive-benchmark
+	udisks-helper-drive-detach
+	udisks-helper-mkfs
+	udisks-helper-ata-smart-collect
+	udisks-helper-change-filesystem-label
+	udisks-helper-modify-partition
+	udisks-helper-delete-partition
+	udisks-helper-create-partition
+	udisks-helper-fstab-mounter
+	udisks-helper-linux-md-remove-component
+	udisks-helper-ata-smart-selftest
+	udisks-helper-drive-poll
+	udisks-dm-export
+	udisks-lvm-pv-export
+	udisks-part-id
+	udisks-probe-ata-smart
+	udisks-probe-sas-expander
+"
+
diff --git a/core/modules/udisks/module.conf.ubuntu.14 b/core/modules/udisks/module.conf.ubuntu.14
new file mode 100644
index 00000000..9ec7f52f
--- /dev/null
+++ b/core/modules/udisks/module.conf.ubuntu.14
@@ -0,0 +1,6 @@
+REQUIRED_INSTALLED_PACKAGES="
+	udisks2
+"
+REQUIRED_CONTENT_PACKAGES="
+	udisks2
+"
diff --git a/core/modules/udisks/module.conf.ubuntu.16 b/core/modules/udisks/module.conf.ubuntu.16
new file mode 100644
index 00000000..9ec7f52f
--- /dev/null
+++ b/core/modules/udisks/module.conf.ubuntu.16
@@ -0,0 +1,6 @@
+REQUIRED_INSTALLED_PACKAGES="
+	udisks2
+"
+REQUIRED_CONTENT_PACKAGES="
+	udisks2
+"
diff --git a/core/modules/udisks/templates/udisks.dbus.service b/core/modules/udisks/templates/udisks.dbus.service
new file mode 100644
index 00000000..f48b064b
--- /dev/null
+++ b/core/modules/udisks/templates/udisks.dbus.service
@@ -0,0 +1,6 @@
+[D-BUS Service]
+Name=org.freedesktop.UDisks
+Exec=%UDISKSD% --no-debug
+User=root
+SystemdService=udisks.service
+
diff --git a/core/modules/udisks/templates/udisks.systemd.service b/core/modules/udisks/templates/udisks.systemd.service
new file mode 100644
index 00000000..d0c41438
--- /dev/null
+++ b/core/modules/udisks/templates/udisks.systemd.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Gnomes bloated 1000 dependency monster aka Disk Manager
+Documentation=man:udisks(8)
+
+[Service]
+Type=dbus
+BusName=org.freedesktop.UDisks
+ExecStart=%UDISKSD% --no-debug
+
diff --git a/core/modules/udisks/templates/udisks2.dbus.service b/core/modules/udisks/templates/udisks2.dbus.service
new file mode 100644
index 00000000..2761a67c
--- /dev/null
+++ b/core/modules/udisks/templates/udisks2.dbus.service
@@ -0,0 +1,6 @@
+[D-BUS Service]
+Name=org.freedesktop.UDisks2
+Exec=%UDISKSD% --no-debug
+User=root
+SystemdService=udisks2.service
+
diff --git a/core/modules/udisks/templates/udisks2.systemd.service b/core/modules/udisks/templates/udisks2.systemd.service
new file mode 100644
index 00000000..d96bd69f
--- /dev/null
+++ b/core/modules/udisks/templates/udisks2.systemd.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Gnomes bloated 1000 dependency monster aka Disk Manager 2
+Documentation=man:udisks(8)
+
+[Service]
+Type=dbus
+BusName=org.freedesktop.UDisks2
+ExecStart=%UDISKSD% --no-debug
+