From a265d6cbda06b54f722455fab5674b7c3f868c6d Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Mon, 30 Jul 2012 13:49:22 -0700 Subject: [PATCH] Make handle-console-change more gentle --- CU2/handle-console-change.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/CU2/handle-console-change.sh b/CU2/handle-console-change.sh index 3ff82fe..db72c30 100755 --- a/CU2/handle-console-change.sh +++ b/CU2/handle-console-change.sh @@ -2,9 +2,13 @@ . ./common.inc -eval $(stat -s /dev/console) || exit 1 -mkdir -p "$DNSCRYPT_BASE_DIR" || exit 1 -chown -R 0:0 "$DNSCRYPT_BASE_DIR" -chown -R "${st_uid}:0" "$CONTROL_DIR" +eval $(stat -s '/dev/console') || exit 1 +wanted_uid="$st_uid" +if [ ! -d "$DNSCRYPT_BASE_DIR" ]; then + mkdir -p "$DNSCRYPT_BASE_DIR" || exit 1 + chown -R 0:0 "$DNSCRYPT_BASE_DIR" +fi +eval $(stat -s "$CONTROL_DIR") || exit 1 +[ "$st_uid" = "$wanted_uid" ] && exit 0 +chown -R "${wanted_uid}:0" "$CONTROL_DIR" find "$DNSCRYPT_BASE_DIR" -type d -exec chmod 755 {} \; -