mostly bugfixes and small improvements ...

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

6 files changed, 15 insertions, 14 deletions

diff --git a/initrd/distro-specs/gentoo/functions-2005.1 b/initrd/distro-specs/gentoo/functions-2005.1
index 30006b3a..1cdc163c 100644
--- a/initrd/distro-specs/gentoo/functions-2005.1
+++ b/initrd/distro-specs/gentoo/functions-2005.1
@@ -18,7 +18,7 @@ postinit () {
 }
 
 config_distro () {
-  :
+echo -e "DXS-VERSION=4.0a\INITRAMFS-GEN-DATE=$date" >> /mnt/etc/SuSE-release
 }
 
 # udev service - not checked!
diff --git a/initrd/distro-specs/suse/functions-9.3 b/initrd/distro-specs/suse/functions-9.3
index 83ec77f6..d9ac0ecb 100644
--- a/initrd/distro-specs/suse/functions-9.3
+++ b/initrd/distro-specs/suse/functions-9.3
@@ -4,7 +4,7 @@
 #		functions file). This file is the main base for the 
 #		following SuSE distributions
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 25-03-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 30-03-2006
 #
 # Copyright:    (c) 2006 - RZ Universitaet Freiburg
 # 
@@ -23,19 +23,20 @@ udevstart
 # distro specific function called from servconfig script
 config_distro () {
 # enable magic sysrequest for the clients
-echo -e "# /etc/sysconfig/sysctl - file modified by $0 version $version"\
+echo -e "# /etc/${D_SYSCONFDIR}/sysctl - file modified by $0 version $version"\
   > /mnt/etc/${D_SYSCONFDIR}/sysctl.new
 sed -e "s,ENABLE_SYSRQ=.*,ENABLE_SYSRQ=\"yes\"," \
   /mnt/etc/${D_SYSCONFDIR}/sysctl > /etc/sysctl
 cat /etc/sysctl >> /mnt/etc/${D_SYSCONFDIR}/sysctl
 # add specific path /var/X11R6/bin ...
-echo -e "# stuff generated by $0 (out of InitRD written $date)\n\ 
-test \"\$UID\" -ge 100 && PATH=\"\$PATH:/var/X11R6/bin:.\"\n\
+echo -e "# stuff generated by $0 (out of InitRD written $date)\n\
+PATH=\"\$PATH:/var/X11R6/bin\"\n\
+test \"\$UID\" -ge 100 && PATH=\"\$PATH:.\"\n\
 QTDIR=/usr/lib/qt3\nexport QTDIR\nno_proxy='localhost'\n\
-export no_proxy" > /etc/SuSEconfig/profile
+export no_proxy" > /mnt/etc/SuSEconfig/profile
+echo -e "DXS-VERSION=4.0a\INITRAMFS-GEN-DATE=$date" >> /mnt/etc/SuSE-release
 }
 
-
 # udev/hotplug - auto device discovery service
 udev_hotplug () {
 local result=0
diff --git a/initrd/initrd-stuff/bin/hwautocfg b/initrd/initrd-stuff/bin/hwautocfg
index c09157e2..5b084ead 100755
--- a/initrd/initrd-stuff/bin/hwautocfg
+++ b/initrd/initrd-stuff/bin/hwautocfg
@@ -263,7 +263,7 @@ done
 . /etc/distro-functions
 
 # heavy debugging output in level 3 and above ...
-[ $DEBUGLEVEL -gt 2 ] && set -x
+[ $DEBUGLEVEL -gt 3 ] && set -x
 
 # set X11 configuration file
 if [ -n "${D_XF86CONFFILE}" ] ; then
@@ -479,7 +479,7 @@ if strinstr "/var/X11R6" "$link" ; then
   done
 fi
 # wait for completion of Xorg configuration
-waitfor /tmp/xready 1000
+waitfor /tmp/xready 10000
 cp /etc/xorg.conf ${D_XF86CONFFILE}
 
 echo "finished" > /tmp/hwcfg
diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig
index 1f12f279..3c8731e7 100755
--- a/initrd/initrd-stuff/bin/servconfig
+++ b/initrd/initrd-stuff/bin/servconfig
@@ -24,7 +24,7 @@
 . /mnt/etc/${D_SYSCONFDIR}/logfile
 
 # heavy debugging output in level 3 and above ...
-[ $DEBUGLEVEL -gt 2 ] && set -x
+[ $DEBUGLEVEL -gt 3 ] && set -x
 
 #######################################################################
 # copy distro specific scripts, programs, libraries and configs
@@ -145,7 +145,7 @@ esac
 #######################################################################
 # 
 # run distro specific configuration function
-config-distro
+config_distro
 
 
 #######################################################################
diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init
index 7081cd3e..d239e170 100755
--- a/initrd/initrd-stuff/init
+++ b/initrd/initrd-stuff/init
@@ -163,11 +163,9 @@ if [ "${DEBUGLEVEL}" -gt 0 ] ; then
   # of the variable
   LOGFILE="/var/log/dxs-boot.log"
   echo "1 4 1 7" >/proc/sys/kernel/printk
-  [ "${DEBUGLEVEL}" -eq 2 ] && MODPRV="-v"
+  [ "${DEBUGLEVEL}" -ge 2 ] && MODPRV="-v"
   [ "${DEBUGLEVEL}" -gt 3 ] && { 
     set -x
-    # modprobe should be verbose
-    MODPRV="-v";
     # and the kernel too
     echo "7 7 7 7" >/proc/sys/kernel/printk; }
 else
diff --git a/initrd/mkdxsinitrd b/initrd/mkdxsinitrd
index 4df246a7..c5bc92fd 100755
--- a/initrd/mkdxsinitrd
+++ b/initrd/mkdxsinitrd
@@ -151,6 +151,8 @@ copy_distro_stuff() {
   cat distro-specs/$1/config-$2 >>${INSTDIR}/etc/sysconfig/config
   cat distro-specs/$1/functions-$2 >>${INSTDIR}/etc/distro-functions
   # would be cool not to copy .svn here ...
+  # fixme!! works only for etc directories. If dir exists then next copy places
+  # file into the existing dir
   cp -a distro-specs/$1/files-$2 ${INSTDIR}/etc/sysconfig/files 2>/dev/null
   # ... so remove them afterwards ...
   find ${INSTDIR}/etc/sysconfig/files \