diff options
| author | Simon Rettberg | 2014-01-24 14:29:45 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2014-01-24 14:29:45 +0100 |
| commit | 84b1fc120880b77572ea61053699967e5a8218b9 (patch) | |
| tree | f7ce9e44d0e656a7e154951d0aa83ea86ed2869b /remote | |
| parent | [pam] Define USER_UID in pam_auth script (diff) | |
| parent | Merge branch 'master' of simonslx:openslx-ng/tm-scripts (diff) | |
| download | tm-scripts-84b1fc120880b77572ea61053699967e5a8218b9.tar.gz tm-scripts-84b1fc120880b77572ea61053699967e5a8218b9.tar.xz tm-scripts-84b1fc120880b77572ea61053699967e5a8218b9.zip | |
Merge branch 'master' of dnbd3:openslx-ng/tm-scripts
Diffstat (limited to 'remote')
| -rwxr-xr-x | remote/modules/pam/data/opt/openslx/scripts/pam_script_auth | 2 | ||||
| -rwxr-xr-x | remote/modules/smartctl/data/opt/openslx/scripts/systemd-smartctl | 6 |
2 files changed, 5 insertions, 3 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 284e78ca..c50e94d5 100755 --- a/remote/modules/pam/data/opt/openslx/scripts/pam_script_auth +++ b/remote/modules/pam/data/opt/openslx/scripts/pam_script_auth @@ -36,7 +36,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/remote/modules/smartctl/data/opt/openslx/scripts/systemd-smartctl b/remote/modules/smartctl/data/opt/openslx/scripts/systemd-smartctl index 6a798563..1eef0a23 100755 --- a/remote/modules/smartctl/data/opt/openslx/scripts/systemd-smartctl +++ b/remote/modules/smartctl/data/opt/openslx/scripts/systemd-smartctl @@ -5,9 +5,11 @@ . /opt/openslx/config [ -z "$SLX_SMARTCTL_MIN_REALLOC" ] && SLX_SMARTCTL_MIN_REALLOC=0 +FILES= -FILE=$(mktemp) for dev in /dev/sd?; do + FILE=$(mktemp) + FILES="$FILES $FILE" smartctl -H -A -f "brief" "$dev" > "$FILE" || continue # should we report devices where smartctl doesn't work? # parse OVERALL=$(grep -o "test result: .*$" "$FILE" | cut -c 14-) @@ -27,5 +29,5 @@ for dev in /dev/sd?; do fi done sleep 2 # give slxlog a little time, as it's running async -rm -f -- "$FILE" +[ -n "$FILES" ] && rm -f -- $FILES # list, no "" |