diff options
| author | Simon Rettberg | 2014-07-04 20:04:41 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2014-07-04 20:04:41 +0200 |
| commit | b7a021b2df67c6d08457df32f3ba1514897ac70b (patch) | |
| tree | f038199bdd92329808f1c54bf41d646d9dfe6fd3 /server | |
| parent | [downloader.inc] Special case sourceforge: Allow setting a mirror in ./config (diff) | |
| download | tm-scripts-b7a021b2df67c6d08457df32f3ba1514897ac70b.tar.gz tm-scripts-b7a021b2df67c6d08457df32f3ba1514897ac70b.tar.xz tm-scripts-b7a021b2df67c6d08457df32f3ba1514897ac70b.zip | |
Try to clean up the mess with all the different kernel version variables everywhere
Diffstat (limited to 'server')
| -rw-r--r-- | server/includes/packing.inc | 4 | ||||
| -rw-r--r-- | server/modules/pam-offenburg/etc/pam.d/common-session | 1 |
2 files changed, 2 insertions, 3 deletions
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 |