From 07be2c0ecf404f9c30ee42544539b39343f40a14 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Tue, 17 Jan 2006 11:15:39 +0000
Subject: dhclient schreibt jetzt Konfiguration sauber nach machine-setup.
 Laden von Modulen durch hwautocfg geht wieder (bind-mount des Modulverz.
 wieder aktiv). servconfig leicht erweitert (acpi und powersave) ...

git-svn-id: http://svn.openslx.org/svn/openslx/dxs/ld4@16 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initrd/mkdxsinitrd | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'initrd/mkdxsinitrd')

diff --git a/initrd/mkdxsinitrd b/initrd/mkdxsinitrd
index 8c1403c2..ce214728 100755
--- a/initrd/mkdxsinitrd
+++ b/initrd/mkdxsinitrd
@@ -3,7 +3,7 @@
 # Description:  universal (distro independent) generator for initial
 #		ramdisks for linux diskless clients 
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 06-01-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 16-01-2006
 #		Blabla
 #		Blub
 #
@@ -15,7 +15,6 @@ DEBUG=1
 LINRC=${INSTDIR}/init
 COMETCEXCL="XF86Config*\nissue*\nmtab*\nfstab*\n"
 COMDIRINDXS="/tmp/scratch /var/lib/nobody"
-set +x
 
 # distro specific settings read from configuration file
 # SYSCONFDIR - system wide configuration settings in /etc - sysconfig in  
@@ -43,6 +42,9 @@ INITBOOTD="<set in ~/distro-config/distro file>"
 RCDIRS="<set in ~/distro-config/distro file>"
 RCDIRSINRW="<set in ~/distro-config/distro file>"
 INITSCRIPTS="<set in ~/distro-config/distro file>"
+XF86CONFFILE="<set in ~/distro-config/distro file>"
+XFONTPATH="<set in ~/distro-config/distro file>"
+DEFAULTCOUNTRY="<set in ~/distro-config/distro file>"
 
 #########################################################################
 # End of global variable declaration, nothing needed to be changed at 
@@ -269,7 +271,7 @@ mkdir -p ${INSTDIR}/usr/share
 mkdir -p ${INSTDIR}/etc/sysconfig
 
 # source configuration file for the distribution used
-DISTRO=debian
+DISTRO=suse
 case "${DISTRO}.${DISVER}" in
   SuSE*|suse*|Suse*|SuSe*)
 	DISTRO=suse-10.0
@@ -360,8 +362,8 @@ for lib in `shared_object_files ${INSTDIR}/bin/*` ; do
 done
 
 # add kernel modules and dependency files
-#KERNVER=2.6.13-15-default
-KERNVER=2.6.12-10-386
+KERNVER=2.6.13-15.7-default
+#KERNVER=2.6.12-10-386
 NWMODULES="e100 tg3 via-rhine"
 FSMODULES="nbd nfs"
 
-- 
cgit v1.2.3-55-g7522