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

16 files changed, 96 insertions, 37 deletions

diff --git a/mltk b/mltk
index ceae7fb2..0c5b2361 100755
--- a/mltk
+++ b/mltk
@@ -112,7 +112,7 @@ check_devtools() {
 		pinfo "For $SYS_DISTRIBUTION you probably need to run:"
 		case $SYS_DISTRIBUTION in
 			ubuntu | debian)
-				pinfo "apt-get install build-essential m4 squashfs-tools"
+				pinfo "apt-get install build-essential m4 squashfs-tools pkg-config"
 				pinfo "to install missing development tools."
 				;;
 			# FIXME: Don't know how precise this filter works so we might want to have a better matching ...
diff --git a/remote/modules/alsa/module.conf.debian b/remote/modules/alsa/module.conf.debian
index b1f9f0e2..5f4d1283 100644
--- a/remote/modules/alsa/module.conf.debian
+++ b/remote/modules/alsa/module.conf.debian
@@ -1,3 +1,8 @@
+REQUIRED_INSTALLED_PACKAGES="
+	alsa-utils
+	alsa-base
+	libasound2
+"
 REQUIRED_CONTENT_PACKAGES="
 	alsa-utils
 	alsa-base
diff --git a/remote/modules/cups/module.conf.debian b/remote/modules/cups/module.conf.debian
new file mode 100644
index 00000000..1bb1efad
--- /dev/null
+++ b/remote/modules/cups/module.conf.debian
@@ -0,0 +1,10 @@
+REQUIRED_INSTALLED_PACKAGES="
+		cups-daemon
+		ghostscript
+		foomatic-filters
+"
+REQUIRED_CONTENT_PACKAGES="
+		cups-daemon
+		ghostscript
+		foomatic-filters
+"
diff --git a/remote/modules/dbus/templates/dbus.service b/remote/modules/dbus/templates/dbus.service
index 760af82f..c9f747b0 100644
--- a/remote/modules/dbus/templates/dbus.service
+++ b/remote/modules/dbus/templates/dbus.service
@@ -6,7 +6,7 @@ After=syslog.target
 
 [Service]
 %UUIDGEN%
-ExecStartPre=-rm -f /var/run/dbus/pid
+ExecStartPre=-/opt/openslx/bin/rm -f /var/run/dbus/pid
 ExecStart=%DAEMON% --system --address=systemd: --nofork %DAEMON_ARGS%
 ExecReload=%SEND% --print-reply --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig
 OOMScoreAdjust=-900
diff --git a/remote/modules/dhcpc-busybox/data/etc/systemd/system/udhcpc@.service b/remote/modules/dhcpc-busybox/data/etc/systemd/system/udhcpc@.service
index edbfd9ed..6c2061a0 100644
--- a/remote/modules/dhcpc-busybox/data/etc/systemd/system/udhcpc@.service
+++ b/remote/modules/dhcpc-busybox/data/etc/systemd/system/udhcpc@.service
@@ -6,5 +6,5 @@ After=systemd-tmpfiles-setup.service
 Type=forking
 PIDFile=/run/udhcpc/udhcpc.%I.pid
 ExecStart=/opt/openslx/scripts/systemd-udhcpc++ %I
-ExecStopPost=rm /run/udhcpc/udhcpc.%I.pid
+ExecStopPost=/opt/openslx/bin/rm /run/udhcpc/udhcpc.%I.pid
 
diff --git a/remote/modules/dnbd3/data/etc/systemd/system/setup-dnbd3.service b/remote/modules/dnbd3/data/etc/systemd/system/setup-dnbd3.service
index bd1cd334..516cbfa2 100644
--- a/remote/modules/dnbd3/data/etc/systemd/system/setup-dnbd3.service
+++ b/remote/modules/dnbd3/data/etc/systemd/system/setup-dnbd3.service
@@ -7,5 +7,5 @@ DefaultDependencies=no
 [Service]
 ExecStart=/opt/openslx/scripts/systemd-setup_dnbd3
 ExecStop=/opt/openslx/bin/dnbd3-client --kill
-ExecStopPost=rm /var/run/dnbd3.socket
+ExecStopPost=/opt/openslx/bin/rm /var/run/dnbd3.socket
 Restart=on-abort
diff --git a/remote/modules/dnbd3/module.conf.debian b/remote/modules/dnbd3/module.conf.debian
index c26fd833..d303245c 100644
--- a/remote/modules/dnbd3/module.conf.debian
+++ b/remote/modules/dnbd3/module.conf.debian
@@ -4,4 +4,5 @@ REQUIRED_CONTENT_PACKAGES="
 
 REQUIRED_INSTALLED_PACKAGES="
                                 cmake
+				zlib1g-dev
 "
diff --git a/remote/modules/idleaction/module.conf.debian b/remote/modules/idleaction/module.conf.debian
new file mode 100644
index 00000000..0dad2e48
--- /dev/null
+++ b/remote/modules/idleaction/module.conf.debian
@@ -0,0 +1,6 @@
+REQUIRED_INSTALLED_PACKAGES="
+	libx11-dev
+	libxss-dev
+	x11proto-scrnsaver-dev
+"
+
diff --git a/remote/modules/kdm/module.conf.debian b/remote/modules/kdm/module.conf.debian
index da0df913..2b1ca00d 100644
--- a/remote/modules/kdm/module.conf.debian
+++ b/remote/modules/kdm/module.conf.debian
@@ -1,11 +1,12 @@
 REQUIRED_INSTALLED_PACKAGES="	
 	kdm
 	kde-workspace-kgreet-plugins
+	ttf-dejavu
 "
 REQUIRED_CONTENT_PACKAGES="	
 	kdm
 	kde-workspace-kgreet-plugins
-	libicu48
+	libicu52
 	libxcursor1
 	libxrandr2
 	libxfixes3
diff --git a/remote/modules/pam/module.conf.debian b/remote/modules/pam/module.conf.debian
index d424f1f7..be237be2 100644
--- a/remote/modules/pam/module.conf.debian
+++ b/remote/modules/pam/module.conf.debian
@@ -20,7 +20,7 @@ REQUIRED_CONTENT_PACKAGES="
 	libpam-ck-connector
 	libpam-cap
 	libldap-2.4-2
-	libpam-ldap
+	libpam-ldapd
 	libnss-ldapd
 	nslcd
 	krb5-user
@@ -49,3 +49,11 @@ REQUIRED_SYSTEM_FILES+="
 	/lib/${ARCH_TRIPLET}/security
 	/sbin/mkhomedir_helper
 "
+
+# For Debian 8: Both packages were dropped from official repos. Do not change the
+# order, as these packages will be installed via dpkg and depend on each other.
+REQUIRED_DOWNLOAD_URLS="
+	ftp.acc.umu.se/mirror/cdimage/snapshot/Debian/pool/main/n/ncpfs/libpam-ncp_2.2.6-9_amd64.deb
+	ftp.acc.umu.se/mirror/cdimage/snapshot/Debian/pool/main/n/ncpfs/libncp_2.2.6-9_amd64.deb
+	ftp.acc.umu.se/mirror/cdimage/snapshot/Debian/pool/main/n/ncpfs/ncpfs_2.2.6-9_amd64.deb
+"
diff --git a/remote/modules/printergui/module.conf.debian b/remote/modules/printergui/module.conf.debian
new file mode 100644
index 00000000..54123003
--- /dev/null
+++ b/remote/modules/printergui/module.conf.debian
@@ -0,0 +1,7 @@
+REQUIRED_INSTALLED_PACKAGES="
+	libcups2-dev
+	libqt4-dev
+"
+REQUIRED_CONTENT_PACKAGES="
+	libcups2-dev
+"
diff --git a/remote/modules/redsocks/data/etc/systemd/system/redsocks.service b/remote/modules/redsocks/data/etc/systemd/system/redsocks.service
index 5d114476..929c24ab 100644
--- a/remote/modules/redsocks/data/etc/systemd/system/redsocks.service
+++ b/remote/modules/redsocks/data/etc/systemd/system/redsocks.service
@@ -7,6 +7,6 @@ Type=forking
 User=redsocks
 PIDFile=/run/redsocks/redsocks.pid
 ExecStart=/sbin/redsocks -c /etc/redsocks.conf -p /run/redsocks/redsocks.pid
-ExecStopPost=rm -f /run/redsocks/redsocks.pid
-ExecStopPost=rm -f /opt/openslx/iptables/rules.d/10-redoscks-proxy
+ExecStopPost=/opt/openslx/bin/rm -f /run/redsocks/redsocks.pid
+ExecStopPost=/opt/openslx/bin/rm -f /opt/openslx/iptables/rules.d/10-redoscks-proxy
 Restart=on-abort
diff --git a/remote/modules/smartctl/module.conf.debian b/remote/modules/smartctl/module.conf.debian
new file mode 100644
index 00000000..d699f2f0
--- /dev/null
+++ b/remote/modules/smartctl/module.conf.debian
@@ -0,0 +1,6 @@
+REQUIRED_CONTENT_PACKAGES="
+	smartmontools
+"
+REQUIRED_INSTALLED_PACKAGES="
+	smartmontools
+"
diff --git a/remote/modules/smbclient/module.conf.debian b/remote/modules/smbclient/module.conf.debian
new file mode 100644
index 00000000..4b33f4bd
--- /dev/null
+++ b/remote/modules/smbclient/module.conf.debian
@@ -0,0 +1,9 @@
+REQUIRED_INSTALLED_PACKAGES="
+	smbclient
+"
+REQUIRED_CONTENT_PACKAGES="
+	smbclient
+"
+REQUIRED_FILES="
+	/usr/lib/cups/backend/smb
+"
diff --git a/remote/modules/xorg/module.conf.debian b/remote/modules/xorg/module.conf.debian
index 2cc9d6f1..86d473a3 100644
--- a/remote/modules/xorg/module.conf.debian
+++ b/remote/modules/xorg/module.conf.debian
@@ -1,38 +1,38 @@
 REQUIRED_INSTALLED_PACKAGES="
 "
 REQUIRED_CONTENT_PACKAGES="	
-			xserver-xorg$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-core$UBUNTU_XORG_PKG_SUFFIX
-			libgl1-mesa-dri$UBUNTU_XORG_PKG_SUFFIX
-			libgl1-mesa-glx$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg
+			xserver-xorg-core
+			libgl1-mesa-dri
+			libgl1-mesa-glx
 			xkb-data
 			x11-xkb-utils
 			x11-xserver-utils
-			xserver-xorg-input-evdev$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-input-mouse$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-input-vmmouse$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-intel$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-ati$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-vesa$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-mga$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-sis$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-vmware$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-fbdev$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-radeon$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-sisusb$UBUNTU_XORG_PKG_SUFFIX
-			xserver-xorg-video-nouveau$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-openchrome$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-savage$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-trident$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-mach64$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-qxl$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-siliconmotion$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-cirrus$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-r128$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-neomagic$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-geode$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-s3$UBUNTU_XORG_PKG_SUFFIX
-			@xserver-xorg-video-tdfx$UBUNTU_XORG_PKG_SUFFIX
+			xserver-xorg-input-evdev
+			xserver-xorg-input-mouse
+			xserver-xorg-input-vmmouse
+			xserver-xorg-video-intel
+			xserver-xorg-video-ati
+			xserver-xorg-video-vesa
+			xserver-xorg-video-mga
+			xserver-xorg-video-sisusb
+			xserver-xorg-video-vmware
+			xserver-xorg-video-fbdev
+			xserver-xorg-video-radeon
+			xserver-xorg-video-sisusb
+			xserver-xorg-video-nouveau
+			@xserver-xorg-video-openchrome
+			@xserver-xorg-video-savage
+			@xserver-xorg-video-trident
+			@xserver-xorg-video-mach64
+			@xserver-xorg-video-qxl
+			@xserver-xorg-video-siliconmotion
+			@xserver-xorg-video-cirrus
+			@xserver-xorg-video-r128
+			@xserver-xorg-video-neomagic
+			@xserver-xorg-video-geode
+			@xserver-xorg-video-s3
+			@xserver-xorg-video-tdfx
 "
 REQUIRED_DIRECTORIES+="
 			/usr/lib 
diff --git a/remote/rootfs/rootfs-stage32/module.conf.debian b/remote/rootfs/rootfs-stage32/module.conf.debian
index 4b80623f..900cd6e1 100644
--- a/remote/rootfs/rootfs-stage32/module.conf.debian
+++ b/remote/rootfs/rootfs-stage32/module.conf.debian
@@ -5,6 +5,12 @@ REQUIRED_INSTALLED_PACKAGES="
 			xfsprogs
 			ntpdate
 			firmware-linux-free
+			curl
+			jfsutils
+			libssl-dev
+"
+REQUIRED_CONTENT_PACKAGES="
+	
 "
 REQUIRED_DIRECTORIES="
 			/lib/xtables