From 5ed9a6825beeb61bcc7b6f74038cc86b068fb714 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Wed, 31 May 2006 18:52:47 +0000
Subject: passwd bug

git-svn-id: http://svn.openslx.org/svn/openslx/ld4@243 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initrd/distro-specs/suse/functions-10.0 | 5 ++++-
 initrd/mkdxsinitrd                      | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'initrd')

diff --git a/initrd/distro-specs/suse/functions-10.0 b/initrd/distro-specs/suse/functions-10.0
index f0d60599..ed41d1f7 100644
--- a/initrd/distro-specs/suse/functions-10.0
+++ b/initrd/distro-specs/suse/functions-10.0
@@ -9,7 +9,10 @@
 # 
 # Version:      0.2.1f
 
-# 
+# empty preinit to overwrite settings from the 9.3 file
+postinit () { 
+: 
+}
 
 # udev service
 udev_hotplug () {
diff --git a/initrd/mkdxsinitrd b/initrd/mkdxsinitrd
index a87906c6..865f7b6f 100755
--- a/initrd/mkdxsinitrd
+++ b/initrd/mkdxsinitrd
@@ -567,6 +567,10 @@ chmod 755 ${INSTDIR}/init \
 if [ -f /etc/dxs/client.cfg/machine-setup.default ] ; then
   cp /etc/dxs/client.cfg/machine-setup.default \
     ${INSTDIR}/etc/machine-setup
+# fixme: dirty hack if the installer does not creates a normal file
+elif [ -f /etc/dxs/client.cfg/machine-setup.default.new ] ; then
+  cp /etc/dxs/client.cfg/machine-setup.default.new \
+    ${INSTDIR}/etc/machine-setup
 elif [ -f ../installer/default_files/machine-setup.default ] ; then
   cp ../installer/default_files/machine-setup.default \
     ${INSTDIR}/etc/machine-setup
-- 
cgit v1.2.3-55-g7522