From 6794ddf6ef9b489eceb3751f1989138617cbf33f Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Mon, 27 Jan 2014 13:12:37 +0100
Subject: [export_target] minor improvement to help message when
 '/export/build' wasn't exported on the remote machine.

---
 server/export_target | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'server')

diff --git a/server/export_target b/server/export_target
index 9e346708..6edcecdc 100755
--- a/server/export_target
+++ b/server/export_target
@@ -55,7 +55,7 @@ sync_remote() {
 	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:/export/build' to '$SERVER_BUILD_DIR' failed with error code: $RET. (Is '/export/build' available on target machine? If not run './mltk -n' on remote machine to export the build directory.)"
 	fi
 }
 
-- 
cgit v1.2.3-55-g7522


From 88dc6cd59a4efb4eb2189af6e6405aa3190ce467 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Wed, 29 Jan 2014 15:30:44 +0100
Subject: [server/configs] new module for ubuntu 13.10: fixes the unity panel
 not starting. Activate this in your server/configs/<yourconfig>! Not
 activated by default for now ...

---
 .../share/dbus-1/services/com.canonical.Unity.Panel.Service.service    | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 server/modules/ubuntu-13.10-unity-fix/usr/share/dbus-1/services/com.canonical.Unity.Panel.Service.service

(limited to 'server')

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
-- 
cgit v1.2.3-55-g7522


From 3893788e1cc74114e015ea483f0180b08959f9c2 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Wed, 29 Jan 2014 16:00:02 +0100
Subject: [pam-freiburg] deleted unneeded nss-ldap hack, since with nss-ldapd
 its ok to have the ldap switch in the nsswitch before ldap is actually
 "queryable"

---
 server/modules/pam-freiburg/etc/nsswitch.conf         | 19 +++++++++++++++++++
 .../etc/systemd/system/activate-nss-ldap.service      | 10 ----------
 .../getty.target.wants/activate-nss-ldap.service      |  1 -
 3 files changed, 19 insertions(+), 11 deletions(-)
 create mode 100644 server/modules/pam-freiburg/etc/nsswitch.conf
 delete mode 100644 server/modules/pam-freiburg/etc/systemd/system/activate-nss-ldap.service
 delete mode 120000 server/modules/pam-freiburg/etc/systemd/system/getty.target.wants/activate-nss-ldap.service

(limited to 'server')

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
-- 
cgit v1.2.3-55-g7522


From 567ab5a78d155d9463717411db3e5780222ef5ea Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Wed, 29 Jan 2014 16:17:06 +0100
Subject: bye bye plymouth. You won't be missed...

---
 remote/targets/stage31/plymouth                                  | 1 -
 remote/targets/stage32-bwlp/plymouth                             | 1 -
 remote/targets/stage32-lightdm/plymouth                          | 1 -
 remote/targets/stage32-opensuse/plymouth                         | 1 -
 remote/targets/stage32-scientific/plymouth                       | 1 -
 remote/targets/stage32/plymouth                                  | 1 -
 server/configs/freiburg/plymouth-freiburg                        | 1 -
 .../plymouth-freiburg/etc/systemd/system/plymouth-quit.service   | 9 ---------
 8 files changed, 16 deletions(-)
 delete mode 120000 remote/targets/stage31/plymouth
 delete mode 120000 remote/targets/stage32-bwlp/plymouth
 delete mode 120000 remote/targets/stage32-lightdm/plymouth
 delete mode 120000 remote/targets/stage32-opensuse/plymouth
 delete mode 120000 remote/targets/stage32-scientific/plymouth
 delete mode 120000 remote/targets/stage32/plymouth
 delete mode 120000 server/configs/freiburg/plymouth-freiburg
 delete mode 100644 server/modules/plymouth-freiburg/etc/systemd/system/plymouth-quit.service

(limited to 'server')

diff --git a/remote/targets/stage31/plymouth b/remote/targets/stage31/plymouth
deleted file mode 120000
index 66a16832..00000000
--- a/remote/targets/stage31/plymouth
+++ /dev/null
@@ -1 +0,0 @@
-../../modules/plymouth
\ No newline at end of file
diff --git a/remote/targets/stage32-bwlp/plymouth b/remote/targets/stage32-bwlp/plymouth
deleted file mode 120000
index 66a16832..00000000
--- a/remote/targets/stage32-bwlp/plymouth
+++ /dev/null
@@ -1 +0,0 @@
-../../modules/plymouth
\ No newline at end of file
diff --git a/remote/targets/stage32-lightdm/plymouth b/remote/targets/stage32-lightdm/plymouth
deleted file mode 120000
index 66a16832..00000000
--- a/remote/targets/stage32-lightdm/plymouth
+++ /dev/null
@@ -1 +0,0 @@
-../../modules/plymouth
\ No newline at end of file
diff --git a/remote/targets/stage32-opensuse/plymouth b/remote/targets/stage32-opensuse/plymouth
deleted file mode 120000
index 66a16832..00000000
--- a/remote/targets/stage32-opensuse/plymouth
+++ /dev/null
@@ -1 +0,0 @@
-../../modules/plymouth
\ No newline at end of file
diff --git a/remote/targets/stage32-scientific/plymouth b/remote/targets/stage32-scientific/plymouth
deleted file mode 120000
index 66a16832..00000000
--- a/remote/targets/stage32-scientific/plymouth
+++ /dev/null
@@ -1 +0,0 @@
-../../modules/plymouth
\ No newline at end of file
diff --git a/remote/targets/stage32/plymouth b/remote/targets/stage32/plymouth
deleted file mode 120000
index 66a16832..00000000
--- a/remote/targets/stage32/plymouth
+++ /dev/null
@@ -1 +0,0 @@
-../../modules/plymouth
\ No newline at end of file
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/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
-- 
cgit v1.2.3-55-g7522


From 55833ba9a9207a132a82ecb67f4536058cffaebd Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 30 Jan 2014 01:03:38 +0100
Subject: Some more blacklisting for stage 4

---
 server/blacklists/desktop-sessions/lightdm-runtime-cache | 4 ++++
 server/blacklists/essential/status-files                 | 1 +
 server/blacklists/persistent-only/ubuntu-update-notifier | 5 +++++
 3 files changed, 10 insertions(+)
 create mode 100644 server/blacklists/desktop-sessions/lightdm-runtime-cache
 create mode 100644 server/blacklists/essential/status-files
 create mode 100644 server/blacklists/persistent-only/ubuntu-update-notifier

(limited to 'server')

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/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/**
+
-- 
cgit v1.2.3-55-g7522


From 2e61e503974571153cd81e662abda5892b8b39e0 Mon Sep 17 00:00:00 2001
From: Sebastian
Date: Thu, 30 Jan 2014 10:40:11 +0100
Subject: allow to change default export path; on remote via mltk -n name; on
 server via export REMOTE_EXPORT_DIR=/export/name

---
 mltk                                   | 13 ++++++++++---
 remote/setup_target                    |  3 ++-
 server/blacklists/essential/linux-base |  2 +-
 server/export_target                   |  9 ++++++---
 4 files changed, 19 insertions(+), 8 deletions(-)

(limited to 'server')

diff --git a/mltk b/mltk
index 95b924d5..4810de06 100755
--- a/mltk
+++ b/mltk
@@ -65,14 +65,16 @@ print_usage() {
 	echo -e ""
 	echo -e "Toolkit for creating preboot mini-linux for OpenSLX NG (mltk)"
 	#echo -e "Usage: $(basename ${SELF}) <target> [-d] [-c [module]*] [-b [module]*] [-p profile]"
-	echo -e "Usage: $ARG0 <target> [-d] [-c [module]*] [-b [module]*] [-n]"
+	echo -e "Usage: $ARG0 <target> [-d] [-c [module]*] [-b [module]*] [-n [name]]"
 	echo -e ""
 	echo -e "  Options:"
 	echo -e "     -d            activates debug output for the task (spamy)"
 	echo -e "     -b            build module(s) and copy them to the target build directory"
 	echo -e "     -c            clean build directory of module(s) and target dir"
 	#echo -e "     -p profile    build all modules from given profile (DEPRECATED?)"
-	echo -e "     -n            bind mount all the local builds (remote/builds) to /export/builds"
+	echo -e "     -n            bind mount all the local builds (remote/builds) to /export/builds;"
+	echo -e "                   the optional parameter name allows to change the default mount target"
+	echo -e "                    <name> -> /export/<name>"
 	echo -e ""
 	echo -e "  You can pass names of specific modules to clean/build (-c / -b)."
 	echo -e "  Otherwise, all modules will be cleaned/built."
@@ -218,7 +220,12 @@ read_params() {
 					continue
 					;;
 				-n)
-					[ "x" != "x$1" ] && perror "'-n' accepts no parameters. Given: $1"
+					if [ -z "$1" ]; then 
+						REMOTE_EXPORT_DIR=/export/build
+					else
+						REMOTE_EXPORT_DIR="/export/$1"
+						shift
+					fi
 					REMOTE_EXPORT="1"
 					continue
 					;;
diff --git a/remote/setup_target b/remote/setup_target
index 11a8ffbb..21831fde 100755
--- a/remote/setup_target
+++ b/remote/setup_target
@@ -54,6 +54,7 @@
 MODE_DIR="${ROOT_DIR}/remote"
 MODULES_DIR="${MODE_DIR}/modules"
 EXPORT_DIR="/export/build"
+[ -z "$REMOTE_EXPORT_DIR" ] || EXPORT_DIR=$REMOTE_EXPORT_DIR
 # Keep track of processed modules so we don't
 # build a module multiple times when following dependencies
 PROCESSED_MODULES=""
@@ -120,7 +121,7 @@ read_build () {
 
 export_builds() {
 	[ ! -d "${MODE_DIR}/builds" ] && perror "No ${MODE_DIR}/builds, nothing to export."
-	if mount|grep -q tm-scripts/remote/builds; then
+	if mount|grep -q ${MODE_DIR}/builds; then
 		pwarning "${MODE_DIR}/builds already exported! Ignoring..."
 		return 1;
 	fi
diff --git a/server/blacklists/essential/linux-base b/server/blacklists/essential/linux-base
index c8f7c343..85392873 100644
--- a/server/blacklists/essential/linux-base
+++ b/server/blacklists/essential/linux-base
@@ -39,7 +39,7 @@
 - /sbin/halt
 - /bin/sh
 # This is where the bind-mount of mltk resides...
-- /export/build
+- /export/
 - /etc/group-
 - /etc/gshadow
 - /etc/gshadow-
diff --git a/server/export_target b/server/export_target
index 6edcecdc..22b8b062 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? If not run './mltk -n' on remote machine to export the build directory.)"
+		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
 }
 
-- 
cgit v1.2.3-55-g7522


From 516d0de0a60364f26ab90ee578f24c526b6250c2 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 31 Jan 2014 00:14:30 +0100
Subject: More things to ignore when cloning stage 4

---
 server/blacklists/essential/linux-base | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'server')

diff --git a/server/blacklists/essential/linux-base b/server/blacklists/essential/linux-base
index 85392873..a7723654 100644
--- a/server/blacklists/essential/linux-base
+++ b/server/blacklists/essential/linux-base
@@ -40,9 +40,31 @@
 - /bin/sh
 # This is where the bind-mount of mltk resides...
 - /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
 
-- 
cgit v1.2.3-55-g7522


From b171064a05caff36a66f8bdc6073395a6dfce23e Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 3 Feb 2014 16:06:00 +0100
Subject: [openslx] Experimental -i switch when packing sqfs to filter files
 from another target (saves 10MB for vmware)

---
 openslx                     |  8 +++++++-
 server/export_target        | 10 +++++++---
 server/includes/packing.inc | 14 ++++++++++----
 3 files changed, 24 insertions(+), 8 deletions(-)

(limited to 'server')

diff --git a/openslx b/openslx
index e5026bab..47fc4070 100755
--- a/openslx
+++ b/openslx
@@ -207,6 +207,12 @@ read_params() {
 					shift
 					continue
 					;;
+				-i)
+					[ "$#" -lt "1" ] && perror "Missing argument to -i"
+					IGNORE_TARGET="$1"
+					shift
+					continue
+					;;
 				*)
 					pwarning "Unknown flag to target: $PARAM"
 					print_usage
@@ -231,7 +237,7 @@ run() {
 		. "${SERVER_EXPORT_TARGET}" || perror "Cannot source ${SERVER_EXPORT_TARGET}"
 		[[ "$SERVER_SYNC" == 1 ]] && sync_remote
 		[[ "$SERVER_CLEAN" == 1 ]] && clean_target "$TARGET"
-		[[ "$SERVER_EXPORT" == 1 ]] && export_target "$TARGET" "$SERVER_EXPORT_TYPE"
+		[[ "$SERVER_EXPORT" == 1 ]] && export_target "$TARGET" "$SERVER_EXPORT_TYPE" "$IGNORE_TARGET"
 		[[ "$SERVER_CONFIG" == 1 ]] && generate_config "$SERVER_CONFIG_TYPE"
 		pinfo "Exiting normally"
 	fi
diff --git a/server/export_target b/server/export_target
index 22b8b062..d930b8ee 100755
--- a/server/export_target
+++ b/server/export_target
@@ -140,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..b94d06e8 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,20 @@ 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
 	rm -f -- "$2"
-	mksquashfs "$1" "$2" -comp xz -b 1M -no-recovery >&6 \
+	mksquashfs "$1" "$2" -ef "$IGNORE" -comp xz -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"
 }
 
-- 
cgit v1.2.3-55-g7522


From 420398ec104244503ba22508356e9b693d51a2ac Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 3 Feb 2014 17:48:45 +0100
Subject: <stage4 blacklist> Ignore /etc/modprobe.d

---
 server/blacklists/essential/linux-base | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'server')

diff --git a/server/blacklists/essential/linux-base b/server/blacklists/essential/linux-base
index a7723654..7a2d6305 100644
--- a/server/blacklists/essential/linux-base
+++ b/server/blacklists/essential/linux-base
@@ -67,4 +67,6 @@
 - /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
 
-- 
cgit v1.2.3-55-g7522


From b9e172c56a991c7e3978fe5ab3c08f907c8c9b2a Mon Sep 17 00:00:00 2001
From: Christian Rößler
Date: Tue, 4 Feb 2014 14:54:56 +0100
Subject: [freiburg-config] +ppd for Dell 1.OG, printer.conf

---
 .../etc/cups/ppd/Rechenzentrum_Dell3100CN.ppd      | 197 +++++++++++++++++++++
 .../modules/cups-freiburg/etc/cups/printers.conf   |  19 ++
 2 files changed, 216 insertions(+)
 create mode 100644 server/modules/cups-freiburg/etc/cups/ppd/Rechenzentrum_Dell3100CN.ppd

(limited to 'server')

diff --git a/server/modules/cups-freiburg/etc/cups/ppd/Rechenzentrum_Dell3100CN.ppd b/server/modules/cups-freiburg/etc/cups/ppd/Rechenzentrum_Dell3100CN.ppd
new file mode 100644
index 00000000..7fdf40ad
--- /dev/null
+++ b/server/modules/cups-freiburg/etc/cups/ppd/Rechenzentrum_Dell3100CN.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: "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..2dd9791e 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 Rechenzentrum\Dell3100CN>
+UUID urn:uuid:5409dd74-e2fe-354e-5f95-a1c9187cbc5e
+AuthInfoRequired none
+Info Rechenzentrum 1.OG, Farbdrucker, nicht öffentlich!
+Location Rechenzentrum H.-Herder-Str., 1. Obergeschoss, Raum 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 stop-printer
+</Printer>
-- 
cgit v1.2.3-55-g7522


From 368943b673bdcfc4ae89409ed55454b7d05d98ac Mon Sep 17 00:00:00 2001
From: Christian Rößler
Date: Tue, 4 Feb 2014 16:02:55 +0100
Subject: [freiburg-config] Better name f. printer

---
 .../cups-freiburg/etc/cups/ppd/ZRZ_DELL.ppd        | 197 +++++++++++++++++++++
 .../modules/cups-freiburg/etc/cups/printers.conf   |   8 +-
 2 files changed, 201 insertions(+), 4 deletions(-)
 create mode 100644 server/modules/cups-freiburg/etc/cups/ppd/ZRZ_DELL.ppd

(limited to 'server')

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..7fdf40ad
--- /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: "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 2dd9791e..b487522d 100644
--- a/server/modules/cups-freiburg/etc/cups/printers.conf
+++ b/server/modules/cups-freiburg/etc/cups/printers.conf
@@ -168,11 +168,11 @@ KLimit 0
 OpPolicy default
 ErrorPolicy abort-job
 </Printer>
-<Printer Rechenzentrum\Dell3100CN>
+<Printer ZRZ_DELL>
 UUID urn:uuid:5409dd74-e2fe-354e-5f95-a1c9187cbc5e
 AuthInfoRequired none
-Info Rechenzentrum 1.OG, Farbdrucker, nicht öffentlich!
-Location Rechenzentrum H.-Herder-Str., 1. Obergeschoss, Raum 117
+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
@@ -185,5 +185,5 @@ QuotaPeriod 0
 PageLimit 0
 KLimit 0
 OpPolicy default
-ErrorPolicy stop-printer
+ErrorPolicy abort-job
 </Printer>
-- 
cgit v1.2.3-55-g7522


From a3339867c7f85e0c92fee09234a32e8cd7c9125e Mon Sep 17 00:00:00 2001
From: Christian Rößler
Date: Tue, 4 Feb 2014 16:50:52 +0100
Subject: [freiburg-config] -ppd, old ppd for Dell 1. OG

---
 .../etc/cups/ppd/Rechenzentrum_Dell3100CN.ppd      | 197 ---------------------
 1 file changed, 197 deletions(-)
 delete mode 100644 server/modules/cups-freiburg/etc/cups/ppd/Rechenzentrum_Dell3100CN.ppd

(limited to 'server')

diff --git a/server/modules/cups-freiburg/etc/cups/ppd/Rechenzentrum_Dell3100CN.ppd b/server/modules/cups-freiburg/etc/cups/ppd/Rechenzentrum_Dell3100CN.ppd
deleted file mode 100644
index 7fdf40ad..00000000
--- a/server/modules/cups-freiburg/etc/cups/ppd/Rechenzentrum_Dell3100CN.ppd
+++ /dev/null
@@ -1,197 +0,0 @@
-*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: "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
-
-- 
cgit v1.2.3-55-g7522


From 077bbe211a42f2ca1cf511f387dd61c34529dbb3 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Tue, 4 Feb 2014 16:51:08 +0100
Subject: [pam-fr] dont delete WIP file while its beeing sent

---
 .../pam-freiburg/opt/openslx/scripts/pam_script_mount_persistent | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'server')

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
 
-- 
cgit v1.2.3-55-g7522


From 44883de473af5b6f287e43cfe8cc4eb3ba7557ce Mon Sep 17 00:00:00 2001
From: Christian Rößler
Date: Tue, 4 Feb 2014 17:30:27 +0100
Subject: [cups-freiburg] ZRZ_DELL.ppd patched: cat path hardcoded as cat's not
 found (should be ameliorated, as hard coded paths are evil).

---
 server/modules/cups-freiburg/etc/cups/ppd/ZRZ_DELL.ppd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'server')

diff --git a/server/modules/cups-freiburg/etc/cups/ppd/ZRZ_DELL.ppd b/server/modules/cups-freiburg/etc/cups/ppd/ZRZ_DELL.ppd
index 7fdf40ad..6e042097 100644
--- a/server/modules/cups-freiburg/etc/cups/ppd/ZRZ_DELL.ppd
+++ b/server/modules/cups-freiburg/etc/cups/ppd/ZRZ_DELL.ppd
@@ -65,7 +65,7 @@
 *VariablePaperSize: False
 
 *FoomaticIDs: Dell-3100cn Postscript
-*FoomaticRIPCommandLine: "cat%A%B%Z"
+*FoomaticRIPCommandLine: "/opt/openslx/bin/cat%A%B%Z"
 *FoomaticRIPNoPageAccounting: True
 
 *OpenGroup: General/General
-- 
cgit v1.2.3-55-g7522


From 49914e9d2800ffd683fdbb5bee33ee9ceacd1d1d Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Wed, 5 Feb 2014 14:07:35 +0100
Subject: [config] add config module to fix pulseaudio not exiting

---
 .../etc/pulse/daemon.conf                          | 87 ++++++++++++++++++++++
 1 file changed, 87 insertions(+)
 create mode 100644 server/modules/ubuntu-13.10-pulseaudio-fix/etc/pulse/daemon.conf

(limited to 'server')

diff --git a/server/modules/ubuntu-13.10-pulseaudio-fix/etc/pulse/daemon.conf b/server/modules/ubuntu-13.10-pulseaudio-fix/etc/pulse/daemon.conf
new file mode 100644
index 00000000..e96f3cf4
--- /dev/null
+++ b/server/modules/ubuntu-13.10-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
-- 
cgit v1.2.3-55-g7522


From 807fef41a83dda69b526cde8ebe1fcdc953910bf Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Wed, 5 Feb 2014 14:09:04 +0100
Subject: renamed

---
 .../etc/pulse/daemon.conf                          | 87 ++++++++++++++++++++++
 .../etc/pulse/daemon.conf                          | 87 ----------------------
 2 files changed, 87 insertions(+), 87 deletions(-)
 create mode 100644 server/modules/ubuntu-13.04-pulseaudio-fix/etc/pulse/daemon.conf
 delete mode 100644 server/modules/ubuntu-13.10-pulseaudio-fix/etc/pulse/daemon.conf

(limited to 'server')

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-pulseaudio-fix/etc/pulse/daemon.conf b/server/modules/ubuntu-13.10-pulseaudio-fix/etc/pulse/daemon.conf
deleted file mode 100644
index e96f3cf4..00000000
--- a/server/modules/ubuntu-13.10-pulseaudio-fix/etc/pulse/daemon.conf
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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
-- 
cgit v1.2.3-55-g7522


From 4f95d147e84628f513014f3f7a98e10a0e99531c Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Wed, 5 Feb 2014 14:09:31 +0100
Subject: [config-freiburg] activate fix

---
 server/configs/freiburg/ubuntu-13.04-pulseaudio-fix | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 server/configs/freiburg/ubuntu-13.04-pulseaudio-fix

(limited to 'server')

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
-- 
cgit v1.2.3-55-g7522


From cc3045dfa8ea524b453a8029a15d16ec1ec7162b Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 19 Feb 2014 14:43:25 +0100
Subject: [openslx] Check if mksquashfs supports xz, fall back to default
 compression if not

---
 server/includes/packing.inc | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'server')

diff --git a/server/includes/packing.inc b/server/includes/packing.inc
index b94d06e8..d24c8e51 100644
--- a/server/includes/packing.inc
+++ b/server/includes/packing.inc
@@ -32,8 +32,17 @@ generate_squashfs() {
 	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" -ef "$IGNORE" -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}')"
-- 
cgit v1.2.3-55-g7522