fixed autofs bug ...

git-svn-id: http://svn.openslx.org/svn/openslx/ld4@218 95ad53e4-c205-0410-b2fa-d234c58c8868

4 files changed, 32 insertions, 25 deletions

diff --git a/initrd/distro-specs/suse/functions-9.3 b/initrd/distro-specs/suse/functions-9.3
index 5a81848c..bd893ae4 100644
--- a/initrd/distro-specs/suse/functions-9.3
+++ b/initrd/distro-specs/suse/functions-9.3
@@ -415,9 +415,14 @@ fi
 config_automount () {
 if [ -f /mnt/etc/${D_SYSCONFDIR}/autofs ] ; then
   testmkd /var/lock/subsys
+  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
   rllinker "autofs" "18" "04"
 else
-  error "$df_erramt"
+  error "$df_erramt" nonfatal
 fi
 }
 # start name service caching daemon
@@ -426,7 +431,7 @@ if [ -f /mnt/etc/${D_INITDIR}/nscd ] ; then
   testmkd /mnt/var/run/nscd
   rllinker "nscd" "02" "16"
 else
-  error "$df_errnsc"
+  error "$df_errnsc" nonfatal
 fi
 }
 
@@ -440,29 +445,33 @@ config_nis () {
 if [ -f /mnt/etc/${D_INITDIR}/ypbind ] ; then
   rllinker "ypbind" "06" "16"
 else
-  error "$df_erryp"
+  error "$df_erryp" nonfatal
 fi
 }
 
 # start vmware
 config_vmware () {
-rllinker "vmware-prep" "18" "02"
-rllinker "vmware" "20" "02"
-# if running start scripts in parallel vmware-prep is not recognized
-# first solution: just avoid running in parallel
-#sed 's/PARALLEL=.*/PARALLEL=no/' /mnt/etc/${D_SYSCONFDIR}/boot \
-#  > /tmp/boot
-#cp /tmp/boot /mnt/etc/${D_SYSCONFDIR}/boot
-# second solution: vmware-prep script should be added to .depends.start
-sed -e "s,TARGETS =,TARGETS = vmware-prep," \
-  /mnt/etc/${D_INITDIR}/.depend.start >> /etc/.depend.start
+if [ -f /mnt/etc/${D_SYSCONFDIR}/vmware ] ; then
+  rllinker "vmware-prep" "18" "02"
+  rllinker "vmware" "20" "02"
+  # if running start scripts in parallel vmware-prep is not recognized
+  # first solution: just avoid running in parallel
+  #sed 's/PARALLEL=.*/PARALLEL=no/' /mnt/etc/${D_SYSCONFDIR}/boot \
+  #  > /tmp/boot
+  #cp /tmp/boot /mnt/etc/${D_SYSCONFDIR}/boot
+  # second solution: vmware-prep script should be added to .depends.start
+  sed -e "s,TARGETS =,TARGETS = vmware-prep," \
+    /mnt/etc/${D_INITDIR}/.depend.start >> /etc/.depend.start
   echo "vmware-prep: " >> /etc/.depend.start
   cp /etc/.depend.start /mnt/etc/${D_INITDIR}/.depend.start
-# this line should be added to /etc/hotplug.d/usb/50-usb.hotplug
-# to block linux from handling usb events during vmware sessions
-sed -e '/USB-specific/{;i\' \
-  -e 'ps aux |grep -i vmware| grep -v "grep" &>/dev/null && exit 0' \
-  -e ' }' -i /mnt/etc/hotplug.d/usb/50-usb.hotplug
+  # this line should be added to /etc/hotplug.d/usb/50-usb.hotplug
+  # to block linux from handling usb events during vmware sessions
+  sed -e '/USB-specific/{;i\' \
+    -e 'ps aux |grep -i vmware| grep -v "grep" &>/dev/null && exit 0' \
+    -e ' }' -i /mnt/etc/hotplug.d/usb/50-usb.hotplug
+else
+  error "df_errvmw" nonfatal
+fi
 }
 
 # initialize runlevel skript to be executed during system startup
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."
diff --git a/installer/ld4-inst b/installer/ld4-inst
index beb71378..2bbdcd88 100755
--- a/installer/ld4-inst
+++ b/installer/ld4-inst
@@ -482,6 +482,8 @@ ${rootdir} ${netname}/${netmask}(ro,no_root_squash,async)" \
         [ -z "$keep" ] && unlink ${2}
       fi
       # linking files 
+      # if SuSE und DHCP dann Kopie statt Link
+      #if ! expr index ${dxs_conf} "dhcp" 
       ln -sf ${dxs_conf}/${1}-${timestamp} ${2}${extension}
     fi
   done