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

...

17 files changed, 398 insertions, 36 deletions

diff --git a/server/blacklists/desktop-sessions/lightdm-runtime-cache b/server/blacklists/desktop-sessions/lightdm-runtime-cache
new file mode 100644
index 00000000..56aa4cc9
--- /dev/null
+++ b/server/blacklists/desktop-sessions/lightdm-runtime-cache
@@ -0,0 +1,4 @@
+- /var/lib/lightdm/**
++ /var/lib/lightdm/**/
++ /var/lib/lightdm/.fontconfig/**
+
diff --git a/server/blacklists/essential/linux-base b/server/blacklists/essential/linux-base
index c8f7c343..7a2d6305 100644
--- a/server/blacklists/essential/linux-base
+++ b/server/blacklists/essential/linux-base
@@ -39,10 +39,34 @@
 - /sbin/halt
 - /bin/sh
 # This is where the bind-mount of mltk resides...
-- /export/build
+- /export/
+# Stuff from /etc we should include in stage 3.2
 - /etc/group-
 - /etc/gshadow
 - /etc/gshadow-
 - /etc/passwd-
 - /etc/shadow-
+- /etc/environment
+- /etc/fstab
+- /etc/group
+- /etc/hostname
+- /etc/hosts
+- /etc/inputrc
+- /etc/issue.net
+- /etc/localtime
+- /etc/login.defs
+- /etc/netconfig
+- /etc/networks
+- /etc/nscd.conf
+- /etc/nsswitch.conf
+- /etc/pam.conf
+- /etc/passwd
+- /etc/profile
+- /etc/protocols
+- /etc/rsyslog.conf
+- /etc/securetty
+- /etc/services
+- /etc/shadow
+# Modprobe.d stuff would be too late if added in stage 4, so put it in stage 3.2
+- /etc/modprobe.d
 
diff --git a/server/blacklists/essential/status-files b/server/blacklists/essential/status-files
new file mode 100644
index 00000000..ed81d019
--- /dev/null
+++ b/server/blacklists/essential/status-files
@@ -0,0 +1 @@
+- /var/lib/logrotate/status
diff --git a/server/blacklists/persistent-only/ubuntu-update-notifier b/server/blacklists/persistent-only/ubuntu-update-notifier
new file mode 100644
index 00000000..fa51a26d
--- /dev/null
+++ b/server/blacklists/persistent-only/ubuntu-update-notifier
@@ -0,0 +1,5 @@
++ /var/lib/ubuntu-release-upgrader/**/
+- /var/lib/ubuntu-release-upgrader/**
++ /var/lib/update-notifier/**/
+- /var/lib/update-notifier/**
+
diff --git a/server/configs/freiburg/plymouth-freiburg b/server/configs/freiburg/plymouth-freiburg
deleted file mode 120000
index 8a14eb6a..00000000
--- a/server/configs/freiburg/plymouth-freiburg
+++ /dev/null
@@ -1 +0,0 @@
-../../modules/plymouth-freiburg
\ No newline at end of file
diff --git a/server/configs/freiburg/ubuntu-13.04-pulseaudio-fix b/server/configs/freiburg/ubuntu-13.04-pulseaudio-fix
new file mode 120000
index 00000000..92979703
--- /dev/null
+++ b/server/configs/freiburg/ubuntu-13.04-pulseaudio-fix
@@ -0,0 +1 @@
+../../modules/ubuntu-13.04-pulseaudio-fix/
\ No newline at end of file
diff --git a/server/export_target b/server/export_target
index 9e346708..d930b8ee 100755
--- a/server/export_target
+++ b/server/export_target
@@ -25,6 +25,9 @@ SERVER_BUILD_DIR="${MODE_DIR}/local_builds/${REMOTE_IP}"
 # target directory
 SERVER_CONFIGS_DIR="${MODE_DIR}/configs"
 
+# allow to specify a different remote export dir via ENV
+[ -z $REMOTE_EXPORT_DIR ] && REMOTE_EXPORT_DIR="/export/build"
+
 # initial checks
 initial_checks() {
 
@@ -46,16 +49,16 @@ copy_kernel() {
 
 sync_remote() {
 	[[ "${#SERVER_BUILD_DIR}" -lt "10" ]] && perror "Safety check failed: SERVER_BUILD_DIR is less than 10 chars. ($SERVER_BUILD_DIR)"
-	pinfo "Synching 'root@$REMOTE_IP:export/build' to '$SERVER_BUILD_DIR'. This might take a while..."
+	pinfo "Synching 'root@$REMOTE_IP:$REMOTE_EXPORT_DIR' to '$SERVER_BUILD_DIR'. This might take a while..."
 	#TODO setup link to remote build directory, later this directory will be rsynced or exported to this server...
 	
 	mkdir -p "${SERVER_BUILD_DIR}" || perror "Could not create directory for local copy of remote system ($SERVER_BUILD_DIR)"
-	rsync -a --numeric-ids --exclude '**/.mltk' --delete --delete-excluded -v -e "ssh -c arcfour -oStrictHostKeyChecking=no" "root@$REMOTE_IP:/export/build/*" "$SERVER_BUILD_DIR"
+	rsync -a --numeric-ids --exclude '**/.mltk' --delete --delete-excluded -v -e "ssh -c arcfour -oStrictHostKeyChecking=no" "root@$REMOTE_IP:$REMOTE_EXPORT_DIR/*" "$SERVER_BUILD_DIR"
 	local RET=$?
 	if [ $RET -eq 0 ]; then
 		pinfo "Syncing completed."
 	else
-		perror "Syncing of 'root@$REMOTE_IP:/export/build' to '$SERVER_BUILD_DIR' failed with error code: $RET. (Is '/export/build' available on target machine?)"
+		perror "Syncing of 'root@$REMOTE_IP:$REMOTE_EXPORT_DIR' to '$SERVER_BUILD_DIR' failed with error code: $RET. (Is '$REMOTE_EXPORT_DIR' available on target machine? If not run './mltk -n' on remote machine to export the build directory.)"
 	fi
 }
 
@@ -137,20 +140,24 @@ export_target() {
 	initial_checks
 	copy_kernel
 
-	TARGET=$1
+	local TARGET="$1"
 	[ -z "$TARGET" ] && perror "No target passed to export_target()"
 	[ -d "${SERVER_BUILD_DIR}/${TARGET}" ] || perror "Given target directory does not exist: ${SERVER_BUILD_DIR}/${TARGET}"
+	if [ -n "$3" ]; then
+		local IGNORE="${SERVER_BUILD_DIR}/$3"
+		[ -d "${IGNORE}" ] || perror "Given 'ignore target' does not exist: ${IGNORE}"
+	fi
 
 	case "$2" in
 		cpio)
 			local TOOL_STR="${TOOL_STR} generate_initramfs:"
 			pinfo "Writing 'initramfs-${TARGET}' to '${SERVER_BOOT_DIR}/'"
-			generate_initramfs "${SERVER_BUILD_DIR}/${TARGET}/" "." "${SERVER_BOOT_DIR}/initramfs-${TARGET}"
+			generate_initramfs "${SERVER_BUILD_DIR}/${TARGET}/" "." "${SERVER_BOOT_DIR}/initramfs-${TARGET}" "$IGNORE"
 			;;
 		sqfs)
 			local TOOL_STR="${TOOL_STR} generate_squashfs:"
 			pinfo "Creating '${TARGET}.sqfs' in '${SERVER_BOOT_DIR}/'"
-			generate_squashfs "${SERVER_BUILD_DIR}/${TARGET}/" "${SERVER_BOOT_DIR}/${TARGET}.sqfs"
+			generate_squashfs "${SERVER_BUILD_DIR}/${TARGET}/" "${SERVER_BOOT_DIR}/${TARGET}.sqfs" "$IGNORE"
 			;;
 		*)
 			perror "Invalid export format: $2"
diff --git a/server/includes/packing.inc b/server/includes/packing.inc
index 85d28de4..d24c8e51 100644
--- a/server/includes/packing.inc
+++ b/server/includes/packing.inc
@@ -7,7 +7,7 @@
 #	generate_initramfs "./server/boot/stage32_sqfs" "./mnt/openslx.sqfs" "./server/boot/initramfs2"
 #	generate_initramfs "./server/build/stage31" "." "./server/boot/initramfs"
 generate_initramfs() {
-	[ $# -ne 3 ] && perror "Sanity check failed: generate_initramfs needs exactly two params, but $# were given."
+	[ $# -lt 3 ] && perror "Sanity check failed: generate_initramfs needs at least three params, but $# were given."
 	cd "$1" || perror "Cannot cd to '$1'"
 	rm -f -- "$3"
 
@@ -23,14 +23,29 @@ generate_initramfs() {
 
 # generates squashfs of directory
 # usage:
-#	generate_squashfs <source_dir> <destination_dir/filename>
+#	generate_squashfs <source_dir> <destination_dir/filename> [ignore_root]
 generate_squashfs() {
-	[ $# -ne 2 ] && perror "Sanity check failed: generate_squashfs needs exactly two params, but $# were given."
+	[ $# -lt 2 ] && perror "Sanity check failed: generate_squashfs needs at least two params, but $# were given."
 	[ -d "$1" ] || perror "$1 is not a directory."
+	local IGNORE="${2}.ignore"
+	truncate -s 0 "$IGNORE"
+	if [ -n "$3" ]; then
+		find "$3" -type f -o -type l | cut -c "$(( ${#3} + 2 ))-" > "$IGNORE"
+	fi
+	# Detect mksquashfs xz support
+	local PARAMS
+	if mksquashfs 2>&1 | grep -A 8 '^-comp' | grep -q '\sxz'; then
+		pinfo "Using xz compression"
+		PARAMS="-comp xz"
+	else
+		pinfo "Using default compression"
+		PARAMS=""
+	fi
 	rm -f -- "$2"
-	mksquashfs "$1" "$2" -comp xz -b 1M -no-recovery >&6 \
+	mksquashfs "$1" "$2" -ef "$IGNORE" $PARAMS -b 1M -no-recovery >&6 \
 		|| perror "mksquashfs failed ($?)."
 	pinfo "Created squashfs of $1 at $2"
 	pinfo "Size: $(du -bsh "$2" | awk 'END {print $1}')"
+	rm -f -- "$IGNORE"
 }
 
diff --git a/server/modules/cups-freiburg/etc/cups/ppd/ZRZ_DELL.ppd b/server/modules/cups-freiburg/etc/cups/ppd/ZRZ_DELL.ppd
new file mode 100644
index 00000000..6e042097
--- /dev/null
+++ b/server/modules/cups-freiburg/etc/cups/ppd/ZRZ_DELL.ppd
@@ -0,0 +1,197 @@
+*PPD-Adobe: "4.3"
+*%
+*% For information on using this, and to obtain the required backend
+*% script, consult http://www.openprinting.org/
+*%
+*% This file is published under the GNU General Public License
+*%
+*% PPD-O-MATIC (3.0.0 or newer) generated this PPD file. It is for use with 
+*% all programs and environments which use PPD files for dealing with
+*% printer capability information. The printer must be configured with the
+*% "foomatic-rip" backend filter script of Foomatic 3.0.0 or newer. This 
+*% file and "foomatic-rip" work together to support PPD-controlled printer
+*% driver option access with arbitrary free software printer drivers and
+*% printing spoolers.
+*%
+*% To save this file on your disk, wait until the download has completed
+*% (the animation of the browser logo must stop) and then use the
+*% "Save as..." command in the "File" menu of your browser or in the 
+*% pop-up manu when you click on this document with the right mouse button.
+*% DO NOT cut and paste this file into an editor with your mouse. This can
+*% introduce additional line breaks which lead to unexpected results.
+*%
+*% You may save this file as 'Dell-3100cn-Postscript.ppd'
+*%
+*%
+*FormatVersion:	"4.3"
+*FileVersion:	"1.1"
+*LanguageVersion: English 
+*LanguageEncoding: ISOLatin1
+*PCFileName:	"POSTSCRI.PPD"
+*Manufacturer:	"Dell"
+*Product:	"(Laser Printer 3100cn)"
+*cupsVersion:	1.0
+*cupsManualCopies: True
+*cupsModelNumber:  2
+*cupsFilter:	"application/vnd.cups-postscript 0 foomatic-rip"
+*%pprRIP:        foomatic-rip other
+*ModelName:     "Dell 3100cn"
+*ShortNickName: "Dell 3100cn Postscript"
+*NickName:      "Dell 3100cn Foomatic/Postscript"
+*PSVersion:	"(3010.000) 550"
+*PSVersion:	"(3010.000) 651"
+*PSVersion:	"(3010.000) 652"
+*PSVersion:	"(3010.000) 653"
+*PSVersion:	"(3010.000) 704"
+*PSVersion:	"(3010.000) 705"
+*PSVersion:	"(3010.000) 800"
+*LanguageLevel:	"3"
+*ColorDevice:	True
+*DefaultColorSpace: RGB
+*FileSystem:	False
+*Throughput:	"1"
+*LandscapeOrientation: Plus90
+*TTRasterizer:	Type42
+*1284DeviceID: "MFG:Dell;MDL:Laser Printer 3100cn;CMD:PJL,RASTER,DOWNLOAD,PCLXL,PCL,POSTSCRIPT;DES:Dell Laser Printer 3100cn;DRV:DPostscript,R0,M0,TP;"
+
+*driverName Postscript/Postscript: ""
+*driverType P/PostScript: ""
+*driverUrl: "http://partners.adobe.com/public/developer/ps/index_specs.html"
+*driverObsolete: False
+
+
+
+
+*VariablePaperSize: False
+
+*FoomaticIDs: Dell-3100cn Postscript
+*FoomaticRIPCommandLine: "/opt/openslx/bin/cat%A%B%Z"
+*FoomaticRIPNoPageAccounting: True
+
+*OpenGroup: General/General
+
+*OpenUI *PageSize/Page Size: PickOne
+*OrderDependency: 100 AnySetup *PageSize
+*DefaultPageSize: A4
+*PageSize A4/A4: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
+*PageSize Letter/US Letter: "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
+*PageSize 11x17/11x17: "<</PageSize[792 1224]/ImagingBBox null>>setpagedevice"
+*PageSize A3/A3: "<</PageSize[842 1191]/ImagingBBox null>>setpagedevice"
+*PageSize A5/A5: "<</PageSize[421 595]/ImagingBBox null>>setpagedevice"
+*PageSize B5/B5 (JIS): "<</PageSize[516 729]/ImagingBBox null>>setpagedevice"
+*PageSize Env10/Envelope #10: "<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
+*PageSize EnvC5/Envelope C5: "<</PageSize[459 649]/ImagingBBox null>>setpagedevice"
+*PageSize EnvDL/Envelope DL: "<</PageSize[312 624]/ImagingBBox null>>setpagedevice"
+*PageSize EnvISOB5/Envelope B5: "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
+*PageSize EnvMonarch/Envelope Monarch: "<</PageSize[279 540]/ImagingBBox null>>setpagedevice"
+*PageSize Executive/Executive: "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
+*PageSize Legal/US Legal: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
+*CloseUI: *PageSize
+
+*OpenUI *PageRegion: PickOne
+*OrderDependency: 100 AnySetup *PageRegion
+*DefaultPageRegion: A4
+*PageRegion A4/A4: "<</PageSize[595 842]/ImagingBBox null>>setpagedevice"
+*PageRegion Letter/US Letter: "<</PageSize[612 792]/ImagingBBox null>>setpagedevice"
+*PageRegion 11x17/11x17: "<</PageSize[792 1224]/ImagingBBox null>>setpagedevice"
+*PageRegion A3/A3: "<</PageSize[842 1191]/ImagingBBox null>>setpagedevice"
+*PageRegion A5/A5: "<</PageSize[421 595]/ImagingBBox null>>setpagedevice"
+*PageRegion B5/B5 (JIS): "<</PageSize[516 729]/ImagingBBox null>>setpagedevice"
+*PageRegion Env10/Envelope #10: "<</PageSize[297 684]/ImagingBBox null>>setpagedevice"
+*PageRegion EnvC5/Envelope C5: "<</PageSize[459 649]/ImagingBBox null>>setpagedevice"
+*PageRegion EnvDL/Envelope DL: "<</PageSize[312 624]/ImagingBBox null>>setpagedevice"
+*PageRegion EnvISOB5/Envelope B5: "<</PageSize[499 709]/ImagingBBox null>>setpagedevice"
+*PageRegion EnvMonarch/Envelope Monarch: "<</PageSize[279 540]/ImagingBBox null>>setpagedevice"
+*PageRegion Executive/Executive: "<</PageSize[522 756]/ImagingBBox null>>setpagedevice"
+*PageRegion Legal/US Legal: "<</PageSize[612 1008]/ImagingBBox null>>setpagedevice"
+*CloseUI: *PageRegion
+
+*DefaultImageableArea: A4
+*ImageableArea A4/A4: "18 36 577 806"
+*ImageableArea Letter/US Letter: "18 36 594 756"
+*ImageableArea 11x17/11x17: "18 36 774 1188"
+*ImageableArea A3/A3: "18 36 824 1155"
+*ImageableArea A5/A5: "18 36 403 559"
+*ImageableArea B5/B5 (JIS): "18 36 498 693"
+*ImageableArea Env10/Envelope #10: "18 36 279 648"
+*ImageableArea EnvC5/Envelope C5: "18 36 441 613"
+*ImageableArea EnvDL/Envelope DL: "18 36 294 588"
+*ImageableArea EnvISOB5/Envelope B5: "18 36 481 673"
+*ImageableArea EnvMonarch/Envelope Monarch: "18 36 261 504"
+*ImageableArea Executive/Executive: "18 36 504 720"
+*ImageableArea Legal/US Legal: "18 36 594 972"
+
+*DefaultPaperDimension: A4
+*PaperDimension A4/A4: "595 842"
+*PaperDimension Letter/US Letter: "612 792"
+*PaperDimension 11x17/11x17: "792 1224"
+*PaperDimension A3/A3: "842 1191"
+*PaperDimension A5/A5: "421 595"
+*PaperDimension B5/B5 (JIS): "516 729"
+*PaperDimension Env10/Envelope #10: "297 684"
+*PaperDimension EnvC5/Envelope C5: "459 649"
+*PaperDimension EnvDL/Envelope DL: "312 624"
+*PaperDimension EnvISOB5/Envelope B5: "499 709"
+*PaperDimension EnvMonarch/Envelope Monarch: "279 540"
+*PaperDimension Executive/Executive: "522 756"
+*PaperDimension Legal/US Legal: "612 1008"
+
+*OpenUI *Resolution/Resolution: PickOne
+*OrderDependency: 110 AnySetup *Resolution
+*DefaultResolution: Unknown
+*Resolution 150x150dpi/150 DPI: "<</HWResolution[150 150]>>setpagedevice"
+*Resolution 300x300dpi/300 DPI: "<</HWResolution[300 300]>>setpagedevice"
+*Resolution 600x600dpi/600 DPI: "<</HWResolution[600 600]>>setpagedevice"
+*Resolution 1200x1200dpi/1200 DPI: "<</HWResolution[1200 1200]>>setpagedevice"
+*CloseUI: *Resolution
+
+*OpenUI *Duplex/Double-Sided Printing: PickOne
+*OrderDependency: 130 AnySetup *Duplex
+*DefaultDuplex: DuplexTumble
+*Duplex DuplexNoTumble/Long Edge (Standard): "<</Duplex true /Tumble false>>setpagedevice"
+*Duplex DuplexTumble/Short Edge (Flip): "<</Duplex true /Tumble true>>setpagedevice"
+*Duplex None/Off: "<</Duplex false>>setpagedevice"
+*CloseUI: *Duplex
+
+*CloseGroup: General
+
+
+*% Generic boilerplate PPD stuff as standard PostScript fonts and so on
+
+*DefaultFont: Courier
+*Font AvantGarde-Book: Standard "(001.006S)" Standard ROM
+*Font AvantGarde-BookOblique: Standard "(001.006S)" Standard ROM
+*Font AvantGarde-Demi: Standard "(001.007S)" Standard ROM
+*Font AvantGarde-DemiOblique: Standard "(001.007S)" Standard ROM
+*Font Bookman-Demi: Standard "(001.004S)" Standard ROM
+*Font Bookman-DemiItalic: Standard "(001.004S)" Standard ROM
+*Font Bookman-Light: Standard "(001.004S)" Standard ROM
+*Font Bookman-LightItalic: Standard "(001.004S)" Standard ROM
+*Font Courier: Standard "(002.004S)" Standard ROM
+*Font Courier-Bold: Standard "(002.004S)" Standard ROM
+*Font Courier-BoldOblique: Standard "(002.004S)" Standard ROM
+*Font Courier-Oblique: Standard "(002.004S)" Standard ROM
+*Font Helvetica: Standard "(001.006S)" Standard ROM
+*Font Helvetica-Bold: Standard "(001.007S)" Standard ROM
+*Font Helvetica-BoldOblique: Standard "(001.007S)" Standard ROM
+*Font Helvetica-Narrow: Standard "(001.006S)" Standard ROM
+*Font Helvetica-Narrow-Bold: Standard "(001.007S)" Standard ROM
+*Font Helvetica-Narrow-BoldOblique: Standard "(001.007S)" Standard ROM
+*Font Helvetica-Narrow-Oblique: Standard "(001.006S)" Standard ROM
+*Font Helvetica-Oblique: Standard "(001.006S)" Standard ROM
+*Font NewCenturySchlbk-Bold: Standard "(001.009S)" Standard ROM
+*Font NewCenturySchlbk-BoldItalic: Standard "(001.007S)" Standard ROM
+*Font NewCenturySchlbk-Italic: Standard "(001.006S)" Standard ROM
+*Font NewCenturySchlbk-Roman: Standard "(001.007S)" Standard ROM
+*Font Palatino-Bold: Standard "(001.005S)" Standard ROM
+*Font Palatino-BoldItalic: Standard "(001.005S)" Standard ROM
+*Font Palatino-Italic: Standard "(001.005S)" Standard ROM
+*Font Palatino-Roman: Standard "(001.005S)" Standard ROM
+*Font Symbol: Special "(001.007S)" Special ROM
+*Font Times-Bold: Standard "(001.007S)" Standard ROM
+*Font Times-BoldItalic: Standard "(001.009S)" Standard ROM
+*Font Times-Italic: Standard "(001.007S)" Standard ROM
+*Font Times-Roman: Standard "(001.007S)" Standard ROM
+*Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM
+*Font ZapfDingbats: Special "(001.004S)" Standard ROM
+
diff --git a/server/modules/cups-freiburg/etc/cups/printers.conf b/server/modules/cups-freiburg/etc/cups/printers.conf
index 9031ca2d..b487522d 100644
--- a/server/modules/cups-freiburg/etc/cups/printers.conf
+++ b/server/modules/cups-freiburg/etc/cups/printers.conf
@@ -168,3 +168,22 @@ KLimit 0
 OpPolicy default
 ErrorPolicy abort-job
 </Printer>
+<Printer ZRZ_DELL>
+UUID urn:uuid:5409dd74-e2fe-354e-5f95-a1c9187cbc5e
+AuthInfoRequired none
+Info interner Drucker - nicht oeffentlich!
+Location RZ/OG/117
+MakeModel Dell 3100cn Foomatic/Postscript
+DeviceURI ipp://vm-pri.ruf.uni-freiburg.de:631/RZKCOLOR
+State Idle
+StateTime 1390844591
+Type 8400924
+Accepting Yes
+Shared Yes
+JobSheets none none
+QuotaPeriod 0
+PageLimit 0
+KLimit 0
+OpPolicy default
+ErrorPolicy abort-job
+</Printer>
diff --git a/server/modules/pam-freiburg/etc/nsswitch.conf b/server/modules/pam-freiburg/etc/nsswitch.conf
new file mode 100644
index 00000000..85c1719a
--- /dev/null
+++ b/server/modules/pam-freiburg/etc/nsswitch.conf
@@ -0,0 +1,19 @@
+# /etc/nsswitch.conf
+#
+# Example configuration of GNU Name Service Switch functionality.
+# If you have the `glibc-doc-reference' and `info' packages installed, try:
+# `info libc "Name Service Switch"' for information about this file.
+
+passwd:         cache compat ldap
+group:          cache compat ldap
+shadow:         compat
+
+hosts:          files mdns4_minimal [NOTFOUND=return] dns mdns4
+networks:       files
+
+protocols:      db files
+services:       db files
+ethers:         db files
+rpc:            db files
+
+netgroup:       nis
diff --git a/server/modules/pam-freiburg/etc/systemd/system/activate-nss-ldap.service b/server/modules/pam-freiburg/etc/systemd/system/activate-nss-ldap.service
deleted file mode 100644
index 664f7dd7..00000000
--- a/server/modules/pam-freiburg/etc/systemd/system/activate-nss-ldap.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Activate NSS-LDAP lookups
-Before=graphical.target
-
-[Service]
-Type=oneshot
-ExecStart=-/opt/openslx/bin/mkdir /tmp/ldap
-ExecStart=/opt/openslx/bin/sed -i -e 's/^passwd:.*$/passwd:\t\tcache files ldap/;s/^group:.*$/group:\t\tcache files ldap/' /etc/nsswitch.conf
-ExecStart=/usr/bin/systemctl restart nscd
-
diff --git a/server/modules/pam-freiburg/etc/systemd/system/getty.target.wants/activate-nss-ldap.service b/server/modules/pam-freiburg/etc/systemd/system/getty.target.wants/activate-nss-ldap.service
deleted file mode 120000
index 1102840c..00000000
--- a/server/modules/pam-freiburg/etc/systemd/system/getty.target.wants/activate-nss-ldap.service
+++ /dev/null
@@ -1 +0,0 @@
-../activate-nss-ldap.service
\ No newline at end of file
diff --git a/server/modules/pam-freiburg/opt/openslx/scripts/pam_script_mount_persistent b/server/modules/pam-freiburg/opt/openslx/scripts/pam_script_mount_persistent
index 8b75b810..9f48d98d 100644
--- a/server/modules/pam-freiburg/opt/openslx/scripts/pam_script_mount_persistent
+++ b/server/modules/pam-freiburg/opt/openslx/scripts/pam_script_mount_persistent
@@ -39,8 +39,9 @@ if ! grep -q "^${PAM_USER}:" "/etc/passwd"; then
 	fi
 
 	SIGNAL=$(mktemp)
+	MOUNT_OUTPUT=$(mktemp)
 	rm -f -- "${SIGNAL}"
-	( mount ${MOUNT_OPTS} "${FILESERVER}:${VOLUME}" "${PERSISTENT_HOME_DIR}" > "/tmp/home.$PAM_USER" 2>&1 || touch "${SIGNAL}" ) &
+	( mount ${MOUNT_OPTS} "${FILESERVER}:${VOLUME}" "${PERSISTENT_HOME_DIR}" > "$MOUNT_OUTPUT" 2>&1 || touch "${SIGNAL}" ) &
 	MOUNT_PID=$!
 	for COUNTER in 1 2 4 4; do
 		kill -0 "${MOUNT_PID}" 2>/dev/null || break
@@ -48,14 +49,14 @@ if ! grep -q "^${PAM_USER}:" "/etc/passwd"; then
 	done
 
 	if [ -e "${SIGNAL}" ]; then
-		slxlog "pam-freiburg" "Mount of '${FILESERVER}:${VOLUME}' to '${PERSISTENT_HOME_DIR}' failed. (Args: ${MOUNT_OPTS})" "/tmp/home.$PAM_USER"
+		slxlog "pam-freiburg" "Mount of '${FILESERVER}:${VOLUME}' to '${PERSISTENT_HOME_DIR}' failed. (Args: ${MOUNT_OPTS})" "$MOUNT_OUTPUT"
 		rm -f -- "${SIGNAL}"
 	elif kill -9 "${MOUNT_PID}" 2>/dev/null; then
-		slxlog "pam-freiburg" "Mount of '${FILESERVER}:${VOLUME}' to '${PERSISTENT_HOME_DIR}' timed out. (Args: ${MOUNT_OPTS})" "/tmp/home.$PAM_USER"
+		slxlog "pam-freiburg" "Mount of '${FILESERVER}:${VOLUME}' to '${PERSISTENT_HOME_DIR}' timed out. (Args: ${MOUNT_OPTS})" "$MOUNT_OUTPUT"
 	else
 		PERSISTENT_OK=yes
 	fi
-	rm -f -- "/tmp/home.$PAM_USER"
+	( sleep 2; rm -f -- "$MOUNT_OUTPUT" ) &
 
 fi
 
diff --git a/server/modules/plymouth-freiburg/etc/systemd/system/plymouth-quit.service b/server/modules/plymouth-freiburg/etc/systemd/system/plymouth-quit.service
deleted file mode 100644
index 0dd31ee4..00000000
--- a/server/modules/plymouth-freiburg/etc/systemd/system/plymouth-quit.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Terminate Plymouth Boot Screen
-Before=display-manager.service
-After=systemd-user-sessions.service
-
-[Service]
-ExecStart=-/bin/plymouth --retain-splash quit
-Type=oneshot
-TimeoutSec=20
diff --git a/server/modules/ubuntu-13.04-pulseaudio-fix/etc/pulse/daemon.conf b/server/modules/ubuntu-13.04-pulseaudio-fix/etc/pulse/daemon.conf
new file mode 100644
index 00000000..e96f3cf4
--- /dev/null
+++ b/server/modules/ubuntu-13.04-pulseaudio-fix/etc/pulse/daemon.conf
@@ -0,0 +1,87 @@
+# This file is part of PulseAudio.
+#
+# PulseAudio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# PulseAudio is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with PulseAudio; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA.
+
+## Configuration file for the PulseAudio daemon. See pulse-daemon.conf(5) for
+## more information. Default values are commented out.  Use either ; or # for
+## commenting.
+
+; daemonize = no
+; fail = yes
+; allow-module-loading = yes
+allow-exit = yes
+; use-pid-file = yes
+; system-instance = no
+; local-server-type = user
+; enable-shm = yes
+; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB
+; lock-memory = no
+; cpu-limit = no
+
+; high-priority = yes
+; nice-level = -11
+
+; realtime-scheduling = yes
+; realtime-priority = 5
+
+exit-idle-time = 0
+; scache-idle-time = 20
+
+; dl-search-path = (depends on architecture)
+
+; load-default-script-file = yes
+; default-script-file = /etc/pulse/default.pa
+
+; log-target = auto
+; log-level = notice
+; log-meta = no
+; log-time = no
+; log-backtrace = 0
+
+resample-method = speex-float-1
+; enable-remixing = yes
+; enable-lfe-remixing = no
+
+flat-volumes = no
+
+; rlimit-fsize = -1
+; rlimit-data = -1
+; rlimit-stack = -1
+; rlimit-core = -1
+; rlimit-as = -1
+; rlimit-rss = -1
+; rlimit-nproc = -1
+; rlimit-nofile = 256
+; rlimit-memlock = -1
+; rlimit-locks = -1
+; rlimit-sigpending = -1
+; rlimit-msgqueue = -1
+; rlimit-nice = 31
+; rlimit-rtprio = 9
+; rlimit-rttime = 1000000
+
+; default-sample-format = s16le
+; default-sample-rate = 44100
+; alternate-sample-rate = 48000
+; default-sample-channels = 2
+; default-channel-map = front-left,front-right
+
+default-fragments = 8
+default-fragment-size-msec = 10
+
+; enable-deferred-volume = yes
+deferred-volume-safety-margin-usec = 1
+; deferred-volume-extra-delay-usec = 0
diff --git a/server/modules/ubuntu-13.10-unity-fix/usr/share/dbus-1/services/com.canonical.Unity.Panel.Service.service b/server/modules/ubuntu-13.10-unity-fix/usr/share/dbus-1/services/com.canonical.Unity.Panel.Service.service
new file mode 100644
index 00000000..c0e729ab
--- /dev/null
+++ b/server/modules/ubuntu-13.10-unity-fix/usr/share/dbus-1/services/com.canonical.Unity.Panel.Service.service
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=com.canonical.Unity.Panel.Service
+Exec=/usr/lib/unity/unity-panel-service