Trying on fix for #65 (different handling of kbd settings for SuSE

distros), minor other fixes and additions ...



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

3 files changed, 15 insertions, 22 deletions

diff --git a/initrd/initrd-stuff/bin/hwautocfg b/initrd/initrd-stuff/bin/hwautocfg
index 7a592917..827611c5 100755
--- a/initrd/initrd-stuff/bin/hwautocfg
+++ b/initrd/initrd-stuff/bin/hwautocfg
@@ -4,7 +4,7 @@
 #		script for linux diskless clients, using hwconfig from 
 #		knoppix as base tool 
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 09-07-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 10-07-2006
 #		Felix Endres
 #
 # Copyright:    (c) 2003 - 2006 - RZ Universitaet Freiburg
@@ -52,20 +52,13 @@ local InputMouseDef='\tIdentifier  "Mouse1"\n
 \tOption\t\t"Buttons"\t\t"3"'
 local InputMouseSyn='\tIdentifier  "Mouse1"\n
 \tDriver\t\t"synaptics"\n
-\tOption\t\t"Protocol"\t\t"auto-dev"\n
-\tOption\t\t"Device"\t\t"/dev/psaux"\n
-\tOption\t\t"LeftEdge"\t\t"1700"\n
-\tOption\t\t"RightEdge"\t\t"5300"\n
-\tOption\t\t"TopEdge"\t\t"1700"\n
-\tOption\t\t"BottomEdge"\t\t"4200"\n
-\tOption\t\t"FingerLow"\t\t"25"\n
-\tOption\t\t"FingerHigh"\t\t"30"\n
-\tOption\t\t"MaxTapTime"\t\t"180"\n
-\tOption\t\t"MaxTapMove"\t\t"220"\n
-\tOption\t\t"VertScrollDelta"\t"100"\n
-\tOption\t\t"MinSpeed"\t\t"0.06"\n
-\tOption\t\t"MaxSpeed"\t\t"0.12"\n
-\tOption\t\t"AccelFactor"\t\t"0.0010"'
+\tOption\t\t"Protocol"\t\t"explorerps/2"\n
+\tOption\t\t"Device"\t\t"/dev/input/mice"\n
+\tOption\t\t"Emulate3Buttons"\t"on"\n
+\tOption\t\t"Buttons"\t\t"5"\n
+\tOption\t\t"InputFashion"\t\t"Mouse"\n
+\tOption\t\t"SHMConfig"\t\t"on"\n
+\tOption\t\t"ZAxisMapping"\t\t"4 5"'
 local Monitor='\tIdentifier "Default"\n
 \tModelName\t"MODEL"\n
 \tOption\t\t"CalcAlgorithm"\t"CheckDesktopGeometry"\n
@@ -455,7 +448,7 @@ done
 
 # wait for completion of clients root filesystem in /mnt
 waitfor /tmp/fscmpl 40000
-cat /tmp/fstab >> /mnt/etc/fstab
+[ -f /tmp/fstab ] && cat /tmp/fstab >> /mnt/etc/fstab
 
 # add entries to initialize keytable and consolefont to boot.ld
 # postpone some commands into normal bootup environment
diff --git a/initrd/initrd-stuff/etc/functions b/initrd/initrd-stuff/etc/functions
index 2814e29c..06fe9e3d 100644
--- a/initrd/initrd-stuff/etc/functions
+++ b/initrd/initrd-stuff/etc/functions
@@ -771,8 +771,8 @@ case "${XMODULE}" in
       test -f /mnt/usr/X11R6/lib/modules/drivers/fglrx_drv.o && \
       XMODULE=fglrx
       # there seems no problem, if no TV is connected
-      TVOUT='\tOption\t"TVFormat" "PAL-B"\n
-\tOption\t"DesktopSetup" "horizontal"'
+      TVOUT='\tOption\t\t"TVFormat" "PAL-B"\n
+\tOption\t\t"DesktopSetup" "horizontal"'
   ;;
   nv)
     #
diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init
index 44c3fe27..2cbc49cd 100755
--- a/initrd/initrd-stuff/init
+++ b/initrd/initrd-stuff/init
@@ -234,6 +234,7 @@ fi
 if [ -n "$noipyet" ] ; then
   waitfor /tmp/dhcp-done 20000
   . /etc/machine-setup
+  [ -f /tmp/confviadhcp ] && . /tmp/confviadhcp
   [ -z "$clientip" -o -z "$subnet_mask" -o -z "$gateway" \
     -o -z "$broadcast_address" ] && error "$init_errdhcp"
   ipsetup $clientip $subnet_mask $gateway $broadcast_address eth0
@@ -358,7 +359,7 @@ if [ -n "${UNIONFS}" ] ; then
   mkdir -p ${RWDIR}/union ${RWDIR}/uniontmp /rorootfs
   mount -n -t tmpfs none ${RWDIR}/uniontmp
   # hack for handling unionfs with patched run-init
-  mount --move /mnt /rorootfs
+  mount -n --move /mnt /rorootfs
   mount -n -t unionfs -o dirs=${RWDIR}/uniontmp=rw:/rorootfs=${NFSRO}ro \
     none /mnt
   mkdir -p /mnt/uniontmp
@@ -367,9 +368,8 @@ if [ -n "${UNIONFS}" ] ; then
   # probably more sources should be merged into union (${UNION} is defined)
   # allow more than one union??
   if [ -n "${UNION}" ] ; then
-    # mkdir /unionadd
-    # for dir in ${UNIONDIRS}; do
-    # mkdir /unionadd/$dir
+    # for dir in "${UNION}"; do
+    # testmkd /unionadd/$dir
     # mount $dir unionadd/$dir 
     # unionctl mnt --add --after /mnt --mode ro /unionadd/$dir
     # most probably it is a good idea to run ldconfig, so enable it