From df0500e35f66592ef09f922968fe8261bc26f887 Mon Sep 17 00:00:00 2001
From: Volker Uhrig
Date: Wed, 14 Sep 2011 16:15:58 +0200
Subject: * Added compatibility for Ubuntu 10.10 * Added nscd support * Added
 checks for required packages

---
 src/initramfs/scripts/bin/servconfig | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/initramfs')

diff --git a/src/initramfs/scripts/bin/servconfig b/src/initramfs/scripts/bin/servconfig
index 84544e23..f3b00519 100755
--- a/src/initramfs/scripts/bin/servconfig
+++ b/src/initramfs/scripts/bin/servconfig
@@ -99,8 +99,10 @@ dlocale
 #############################################################################
 # setup passwd and shadow for local system users like root, bin, daemon and
 # nobody if no user/admin provided passwd exists ... fixme: see #206
-[ ! -e /rootfs/etc/shadow ] && \
-  basepasswd $(sed "/+::0/d;s/root://;s/:.*//" /rootfs/etc/shadow 2>/dev/null)
+if [ ! -e /initramfs/plugin-conf/auth.conf ]; then
+  [ ! -e /rootfs/etc/shadow ] && \
+    basepasswd $(sed "/+::0/d;s/root://;s/:.*//" /rootfs/etc/shadow 2>/dev/null)
+fi
 
 #############################################################################
 # dns and ip configuration
@@ -174,8 +176,8 @@ config_udev
 # (check for runlevel scripts, passwd entries, directories ...)
 config_dreshal
 
-# configure automounter (should be moved to plugin)
-if [ "x$automnt" != "xno" ] ; then
+# configure automounter if auth-plugin is not used
+if [ "x$automnt" != "xno" -a ! -e /initramfs/plugin-conf/auth.conf ] ; then
   # check if there is some user provided configuration (only auto.master is
   # important) and skip automatic setup
   if [ ! -f /rootfs/etc/auto.master ] ; then
-- 
cgit v1.2.3-55-g7522