Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts

7 files changed, 92 insertions, 21 deletions

diff --git a/remote/modules/udisks/templates/udisks2.systemd.service b/remote/modules/udisks/templates/udisks2.systemd.service
index 47105a71..d96bd69f 100644
--- a/remote/modules/udisks/templates/udisks2.systemd.service
+++ b/remote/modules/udisks/templates/udisks2.systemd.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Gnomes bloated 1000 dependency monster aka Disk Manager
+Description=Gnomes bloated 1000 dependency monster aka Disk Manager 2
 Documentation=man:udisks(8)
 
 [Service]
diff --git a/remote/modules/udisks/udisks.build b/remote/modules/udisks/udisks.build
index 1e9e73b0..ab9df016 100644
--- a/remote/modules/udisks/udisks.build
+++ b/remote/modules/udisks/udisks.build
@@ -13,26 +13,41 @@ build () {
 		cp -a "$MODULE_BUILD_DIR/lib/udev" "$MODULE_BUILD_DIR/usr/lib/" || perror "Could not move /lib/udev to /usr/lib/udev"
 	fi
 	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)
-	[ -z "$BINARY" ] && BINARY=$(find "$MODULE_BUILD_DIR" -name udisks-daemon -executable | head -n 1)
-	[ -z "$BINARY" ] && perror "Could not determine the udisks(1/2) daemon binary from inspecting $MODULE_BUILD_DIR"
-	BINARY="/${BINARY#$MODULE_BUILD_DIR}"
-	if [[ "$BINARY" == *udisks2* || -d "$MODULE_BUILD_DIR/usr/lib/udisks2" ]]; then
+	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" templates/udisks2.systemd.service > "$MODULE_BUILD_DIR/etc/systemd/system/udisks2.service" || perror "Error creating systemd service for udisks2"
+		sed "s,%UDISKSD%,$BINARY,g" 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" 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" templates/udisks1.systemd.service > "$MODULE_BUILD_DIR/etc/systemd/system/udisks.service" || perror "Error creating systemd service for udisks"
-		sed "s,%UDISKSD%,$BINARY,g" templates/udisks1.dbus.service > "$MODULE_BUILD_DIR/usr/share/dbus-1/system-services/org.freedesktop.UDisks.service" || perror "Error creating dbus service for udisks"
+		sed "s,%UDISKSD%,$BINARY,g" 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" 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
 }
 
-post_copy () {
-	:
-}
-
diff --git a/remote/modules/udisks/udisks.conf.ubuntu b/remote/modules/udisks/udisks.conf.ubuntu
index abf12be7..3d127619 100644
--- a/remote/modules/udisks/udisks.conf.ubuntu
+++ b/remote/modules/udisks/udisks.conf.ubuntu
@@ -1,7 +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/remote/modules/udisks/udisks.conf.ubuntu.12 b/remote/modules/udisks/udisks.conf.ubuntu.12
index 0b8690bd..b962ec65 100644
--- a/remote/modules/udisks/udisks.conf.ubuntu.12
+++ b/remote/modules/udisks/udisks.conf.ubuntu.12
@@ -4,4 +4,28 @@ REQUIRED_INSTALLED_PACKAGES="
 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/remote/rootfs/rootfs-stage32/templates/issue.template b/remote/rootfs/rootfs-stage32/templates/issue.template
index e200c1c0..a79797ad 100644
--- a/remote/rootfs/rootfs-stage32/templates/issue.template
+++ b/remote/rootfs/rootfs-stage32/templates/issue.template
@@ -1,9 +1,9 @@
-   WELCOME TO  %space%   \n (\l)
-           _____  ______  ______ __    __    _______ __     __    __
-          /  _   |   _   |   ___|  |  |  |  |   ____|  |   |  |  |  |
-         |  | |  |  |_|  |  |_  |   |    |  |  |___ |  |        /  /
-         |  | |  |   ___/|   _|      |   |   ____   |  |     |    |
-         |  |_|  |  |    |  |___|  |  |  |   ____|  |  |___ /  /
-           _____/|__|    |______|__|  |__|  |_______|______|__|  |__| - NG
+   WELCOME TO %space% \n (\l)
+            _____  ______  ______ __    __    _______ __     __    __
+           /  _   |   _   |   ___|  |  |  |  |   ____|  |   |  |  |  |
+          |  | |  |  |_|  |  |_  |   |    |  |  |___ |  |        /  /
+          |  | |  |   ___/|   _|      |   |   ____   |  |     |    |
+          |  |_|  |  |    |  |___|  |  |  |   ____|  |  |___ /  /
+            _____/|__|    |______|__|  |__|  |_______|______|__|  |__| - NG
 
-   %version%  (c) <OpenSLX.ORG>
+   %version%           (c) <OpenSLX.ORG>
diff --git a/server/blacklists/x-autostart/kde-autostart b/server/blacklists/x-autostart/kde-autostart
index 4d384303..131a8563 100644
--- a/server/blacklists/x-autostart/kde-autostart
+++ b/server/blacklists/x-autostart/kde-autostart
@@ -1,5 +1,10 @@
 + /usr/share/autostart/**/
 - /usr/share/autostart/**
++ /usr/share/autostart/kdesktop.desktop
++ /usr/share/autostart/krunner.desktop
++ /usr/share/autostart/plasma.desktop
++ /usr/share/autostart/plasma-desktop.desktop
++ /usr/share/autostart/polkit-kde-authentication-agent-1.desktop
 + /opt/kde3/share/autostart/**/
 - /opt/kde3/share/autostart/**
 
diff --git a/server/modules/pam-freiburg/etc/pam.d/common-session b/server/modules/pam-freiburg/etc/pam.d/common-session
index 1eb564a3..9a8b73e1 100644
--- a/server/modules/pam-freiburg/etc/pam.d/common-session
+++ b/server/modules/pam-freiburg/etc/pam.d/common-session
@@ -27,7 +27,7 @@ session	required        pam_permit.so
 session optional        pam_umask.so
 # and here are more per-package modules (the "Additional" block)
 session	required        pam_systemd.so
-session optional			pam_ck_connector.so nox11
+session optional			pam_ck_connector.so
 session optional        pam_env.so readenv=1
 session optional        pam_env.so readenv=1 envfile=/etc/default/locale
 session	optional        pam_krb5.so minimum_uid=1000