diff options
| author | Simon Rettberg | 2014-01-23 19:29:47 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2014-01-23 19:29:47 +0100 |
| commit | 60d101f882fdca7b313e07d0f88a748ec1e22453 (patch) | |
| tree | 76d16dfbb69a6c1eb5f7f0d2dc96448e12d6caab | |
| parent | [smartctl] Create new temp file for each drive to prevent race conditions (diff) | |
| parent | [pam] typo fix in WARNING.txt (diff) | |
| download | tm-scripts-60d101f882fdca7b313e07d0f88a748ec1e22453.tar.gz tm-scripts-60d101f882fdca7b313e07d0f88a748ec1e22453.tar.xz tm-scripts-60d101f882fdca7b313e07d0f88a748ec1e22453.zip | |
Merge branch 'master' of simonslx:openslx-ng/tm-scripts
| -rwxr-xr-x | remote/modules/pam/data/opt/openslx/scripts/pam_script_auth | 2 | ||||
| -rwxr-xr-x | server/modules/pam-freiburg/etc/profile.d/00-autostart.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/remote/modules/pam/data/opt/openslx/scripts/pam_script_auth b/remote/modules/pam/data/opt/openslx/scripts/pam_script_auth index 611b565a..62de1f89 100755 --- a/remote/modules/pam/data/opt/openslx/scripts/pam_script_auth +++ b/remote/modules/pam/data/opt/openslx/scripts/pam_script_auth @@ -35,7 +35,7 @@ mount -t tmpfs -o size=100m tmpfs "${TEMP_HOME_DIR}" || \ # create a WARNING.txt for the user cat > "${TEMP_HOME_DIR}/WARNING.txt" << EOF -ATTENTION: This is the non-persistant home directory! +ATTENTION: This is the non-persistent home directory! Files saved here will be lost on shutdown. Your real home is under /home/<user>/PERSISTENT. Please save your files there. diff --git a/server/modules/pam-freiburg/etc/profile.d/00-autostart.sh b/server/modules/pam-freiburg/etc/profile.d/00-autostart.sh index 18835457..642aa002 100755 --- a/server/modules/pam-freiburg/etc/profile.d/00-autostart.sh +++ b/server/modules/pam-freiburg/etc/profile.d/00-autostart.sh @@ -7,7 +7,7 @@ if [ -d "$PERSISTENT_HOME_DIR" ]; then # Persistent home was mounted, take care of some conveinience # Dirs - for file in .vim .mozilla .thunderbird .config/chromium .config/htop .config/openslx; do + for file in .vim .mozilla .thunderbird .config/chromium .config/htop .config/openslx .config/xfce4; do [ -e "$TEMP_HOME_DIR/$file" ] && break if [ "x$(dirname "$file")" != "x." ]; then mkdir -p "$TEMP_HOME_DIR/$(dirname "$file")" |