From 6d40cb3981a1243ff64242ecc0573cff21931d29 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Thu, 18 May 2006 17:07:30 +0000
Subject: fixed autofs bug ...

git-svn-id: http://svn.openslx.org/svn/openslx/ld4@218 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initrd/initrd-stuff/bin/servconfig | 9 ++-------
 initrd/initrd-stuff/etc/messages   | 1 +
 2 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'initrd/initrd-stuff')

diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig
index bb5e7117..10963822 100755
--- a/initrd/initrd-stuff/bin/servconfig
+++ b/initrd/initrd-stuff/bin/servconfig
@@ -196,8 +196,8 @@ if [ -n "${automnt_src}" ] ; then
   # remove leading and trailing slash
   automnt_dir=${automnt_dir#/}
   automnt_dir=${automnt_dir%/}
-  test -d ${automnt_dir} || error "scfg_erradir"
-  strinstr "/" ${automnt_dir} || error "scfg_erratpld"
+  test -d ${automnt_dir} || error "$scfg_erradir"
+  strinstr "/" ${automnt_dir} || error "$scfg_erratpld"
   echo -e "/${automnt_dir}\t/etc/auto.${automnt_dir}\n" \
     >> /mnt/etc/auto.master
   echo -e "# /etc/auto.${automnt_dir} created by $0:\n" \
@@ -207,11 +207,6 @@ if [ -n "${automnt_src}" ] ; then
   # portmapper is needed for remote NFS sources
   config_portmap
 fi
-echo -e "# /etc/${D_SYSCONFDIR}/autofs - file modified by\n#\t$0:\n#" \
-  > /etc/autofs
-sed -e "s,AUTOFS_OPTIONS.*,AUTOFS_OPTIONS=\"--timeout 3\"," \
-  /mnt/etc/${D_SYSCONFDIR}/autofs >> /etc/autofs
-cp /etc/autofs /mnt/etc/${D_SYSCONFDIR}/autofs
 config_automount
 # fi
 
diff --git a/initrd/initrd-stuff/etc/messages b/initrd/initrd-stuff/etc/messages
index 865774be..7484ae97 100644
--- a/initrd/initrd-stuff/etc/messages
+++ b/initrd/initrd-stuff/etc/messages
@@ -126,6 +126,7 @@ df_errcron="  The cron start script $df_errserv"
 df_errsysl="  The syslog start script $df_errserv"
 df_errsshd="  The sshd start script $df_errserv"
 df_erryp="  The NIS client $df_errserv"
+df_errvmw="  VMware X86 emulation $df_errserv"
 df_erramnt="  Automounter $df_errserv"
 df_errnsc="  Name Service caching deamon $df_errserv\n This service might \
 be useful to take load from a ldap user directory."
-- 
cgit v1.2.3-55-g7522