From b7a021b2df67c6d08457df32f3ba1514897ac70b Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 4 Jul 2014 20:04:41 +0200
Subject: Try to clean up the mess with all the different kernel version
 variables everywhere

---
 server/includes/packing.inc                           | 4 ++--
 server/modules/pam-offenburg/etc/pam.d/common-session | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'server')

diff --git a/server/includes/packing.inc b/server/includes/packing.inc
index d24c8e51..aaa088aa 100644
--- a/server/includes/packing.inc
+++ b/server/includes/packing.inc
@@ -41,8 +41,8 @@ generate_squashfs() {
 		pinfo "Using default compression"
 		PARAMS=""
 	fi
-	rm -f -- "$2"
-	mksquashfs "$1" "$2" -ef "$IGNORE" $PARAMS -b 1M -no-recovery >&6 \
+	rm -f -- "$2" # -no-exports ?
+	mksquashfs "$1" "$2" -ef "$IGNORE" $PARAMS -b 1M -no-recovery -always-use-fragments >&6 \
 		|| perror "mksquashfs failed ($?)."
 	pinfo "Created squashfs of $1 at $2"
 	pinfo "Size: $(du -bsh "$2" | awk 'END {print $1}')"
diff --git a/server/modules/pam-offenburg/etc/pam.d/common-session b/server/modules/pam-offenburg/etc/pam.d/common-session
index d79eec68..4c4a7e95 100644
--- a/server/modules/pam-offenburg/etc/pam.d/common-session
+++ b/server/modules/pam-offenburg/etc/pam.d/common-session
@@ -27,7 +27,6 @@ session	required        pam_permit.so
 session optional        pam_umask.so
 # and here are more per-package modules (the "Additional" block)
 session	required        pam_systemd.so
-session optional			pam_ck_connector.so nox11
 session optional        pam_env.so readenv=1
 session optional        pam_env.so readenv=1 envfile=/etc/default/locale
 session	[success=1]     pam_unix.so 
-- 
cgit v1.2.3-55-g7522