summaryrefslogtreecommitdiff
path: root/user-init
diff options
context:
space:
mode:
Diffstat (limited to 'user-init')
-rwxr-xr-xuser-init15
1 files changed, 13 insertions, 2 deletions
diff --git a/user-init b/user-init
index 214cbaf..1a2d851 100755
--- a/user-init
+++ b/user-init
@@ -9,11 +9,22 @@ mac=".mac"
pc=".pc"
xchange=".xchange"
-. /etc/adduser.conf || exit 1
+if [ -e /etc/adduser.conf ]; then
+ . /etc/adduser.conf
+else
+ echo "/etc/adduser.conf missing. Exiting..."
+ exit 1
+fi
[ -f /etc/local/users.conf ] && . /etc/local/users.conf
-. /etc/local/volumes || exit 0
+if [ -e /etc/local/volumes ]; then
+ . /etc/local/volumes
+else
+ # exit silently if this system lacks required hints
+ exit 0
+fi
+
XDIRREAL="$XDIR/users/root"
if [ $XCHANGE ]; then