diff options
| author | Dirk | 2013-12-13 18:13:04 +0100 |
|---|---|---|
| committer | Dirk | 2013-12-13 18:13:04 +0100 |
| commit | c89c15556e55b43fa50ed9d76b2ffd7ed7bc2c1c (patch) | |
| tree | d06acc0585d5b049ca9f6c7de09b282815160520 /server/modules | |
| parent | Static configuration file for udhcpd sitting on new nat1 bridge interface. (diff) | |
| parent | add linkstate check; add dmesg to stage32 (for debug) (diff) | |
| download | tm-scripts-c89c15556e55b43fa50ed9d76b2ffd7ed7bc2c1c.tar.gz tm-scripts-c89c15556e55b43fa50ed9d76b2ffd7ed7bc2c1c.tar.xz tm-scripts-c89c15556e55b43fa50ed9d76b2ffd7ed7bc2c1c.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
...
Diffstat (limited to 'server/modules')
3 files changed, 24 insertions, 18 deletions
diff --git a/server/modules/beamer-freiburg/opt/openslx/beamergui/beamer.conf b/server/modules/beamer-freiburg/opt/openslx/beamergui/beamer.conf new file mode 100644 index 00000000..52fc0033 --- /dev/null +++ b/server/modules/beamer-freiburg/opt/openslx/beamergui/beamer.conf @@ -0,0 +1,2 @@ +[SpecificSettings] +132.230.4.100=1280x800 diff --git a/server/modules/cups-freiburg/etc/cups/ppd/RZFARBE.ppd b/server/modules/cups-freiburg/etc/cups/ppd/RZFARBE.ppd index 4ca096d0..e649b392 100644 --- a/server/modules/cups-freiburg/etc/cups/ppd/RZFARBE.ppd +++ b/server/modules/cups-freiburg/etc/cups/ppd/RZFARBE.ppd @@ -2486,7 +2486,7 @@ *OpenUI *Duplex/2-Sided Print: PickOne *OrderDependency: 10 AnySetup *Duplex -*DefaultDuplex: None +*DefaultDuplex: DuplexNoTumble *Duplex None/1-Sided Print: " (<<) cvx exec /Duplex false /Tumble false (>>) cvx exec setpagedevice" *End 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 f6a295f2..d8808f66 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 @@ -30,22 +30,26 @@ if [ $(id -g ${PAM_USER}) -ge 1000 ]; then # now we can mount the home directory! - MOUNT_OPTS="-t nfs4 -o rw,nosuid,nodev,nolock,intr,hard,sloppy,sec=krb5p" - - SIGNAL=$(mktemp) - rm -f -- "${SIGNAL}" - (mount ${MOUNT_OPTS} "${FILESERVER}:${VOLUME}" "${PERSISTENT_HOME_DIR}" || touch "${SIGNAL}") & - MOUNT_PID=$! - for COUNTER in 1 2 4 4; do - kill -0 "${MOUNT_PID}" 2>/dev/null || break - sleep "${COUNTER}" - done - - if [ -e "${SIGNAL}" ] || kill -9 "${MOUNT_PID}" 2>/dev/null; then - slxlog "pam-freiburg" "Mount of '${FILESERVER}:${VOLUME}' to '${PERSISTENT_HOME_DIR}' failed. (Args: ${MOUNT_OPTS})" - rm -f -- "${SIGNAL}" - else - exit 0 - fi + MOUNT_OPTS="-t nfs4 -o rw,nosuid,nodev,nolock,intr,hard,sloppy" + if echo "$FILESERVER" | grep -q "sunfs6"; then + MOUNT_OPTS="${MOUNT_OPTS},sec=krb5i" + else + MOUNT_OPTS="${MOUNT_OPTS},sec=krb5p" + fi + + SIGNAL=$(mktemp) + rm -f -- "${SIGNAL}" + ( mount ${MOUNT_OPTS} "${FILESERVER}:${VOLUME}" "${PERSISTENT_HOME_DIR}" > "/tmp/home.$PAM_USER" 2>&1 || touch "${SIGNAL}" ) & + MOUNT_PID=$! + for COUNTER in 1 2 4 4; do + kill -0 "${MOUNT_PID}" 2>/dev/null || break + sleep "${COUNTER}" + done + + if [ -e "${SIGNAL}" ] || kill -9 "${MOUNT_PID}" 2>/dev/null; then + slxlog "pam-freiburg" "Mount of '${FILESERVER}:${VOLUME}' to '${PERSISTENT_HOME_DIR}' failed. (Args: ${MOUNT_OPTS})" "/tmp/home.$PAM_USER" + rm -f -- "${SIGNAL}" + fi + rm -f -- "/tmp/home.$PAM_USER" fi |