From ee3fbfe619b4f8a43f7370fc048e2d95943c0188 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sat, 30 Mar 2002 02:54:53 +0000
Subject: Ask about access to local devices in adduser.local, and exit
 user-init cleanly if unsupported.

---
 user-init | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'user-init')

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
-- 
cgit v1.2.3