From c695e65603b1d7e9e80485c3b8d1e2eadbffb0db Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Mon, 4 Jun 2007 18:37:30 +0000
Subject: Avoid pitfall if resolv.conf is a link.

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1146 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initramfs/distro-specs/debian/config-default | 2 +-
 initramfs/initrd-stuff/bin/servconfig        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/initramfs/distro-specs/debian/config-default b/initramfs/distro-specs/debian/config-default
index dac2b5aa..d1daa173 100644
--- a/initramfs/distro-specs/debian/config-default
+++ b/initramfs/distro-specs/debian/config-default
@@ -50,7 +50,7 @@ D_RCDIRS="/rc0.d /rc1.d /rc2.d /rc3.d /rc4.d /rc5.d /rc6.d"
 D_INITDEFAULT="3"
 # fixme: is keymap.sh really needed? Should be handled in a simpler fashion
 # via boot.slx (see hwautocfg)
-D_INITSCRIPTS="mountvirtfs udev procps.sh bootlogd keymap.sh hwclock.sh sudo dbus-1"
+D_INITSCRIPTS="mountkernfs.sh mountvirtfs udev procps.sh bootlogd keymap.sh hwclock.sh sudo dbus-1"
 D_XF86CONFFILE="/etc/X11/xorg.conf"
 D_XORGBIN=/usr/X11R6/bin/X
 D_XFONTPATH="/usr/X11R6/lib/X11/fonts/*"
diff --git a/initramfs/initrd-stuff/bin/servconfig b/initramfs/initrd-stuff/bin/servconfig
index aea0e16f..6a4f04e8 100755
--- a/initramfs/initrd-stuff/bin/servconfig
+++ b/initramfs/initrd-stuff/bin/servconfig
@@ -169,6 +169,7 @@ else
   echo -e "$clientip\t$host_name" >>/mnt/etc/hosts
 fi
 # set up domainname and resolving
+rm -rf /mnt/etc/resolv.conf
 test -n "$domain_name" && \
   echo -e "# /etc/resolv.conf - file generated by\n#\t$0:\n\
 #\t$date\n#options timeout:1 attempts:1 rotate\n\
-- 
cgit v1.2.3-55-g7522