Mainly Fixes for Ubuntu 5.10

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

7 files changed, 13 insertions, 12 deletions

diff --git a/initrd/distro-specs/debian/config-default b/initrd/distro-specs/debian/config-default
index 55be830a..2f1d638d 100644
--- a/initrd/distro-specs/debian/config-default
+++ b/initrd/distro-specs/debian/config-default
@@ -30,7 +30,7 @@ pptp.d\nisdn\nyouservers\nhardware/hwcfg*\n\
 X11/xdm/pixmaps\ndhclient.script\n\
 rc2.d/*\nrc5.d/*"
 D_BINDMPTS="tmp root home"
-D_DIRINBINDMNT="/var/run /var/log /var/tmp /var/lib/gdm"
+D_DIRINBINDMNT="/var/run /var/log /var/tmp /var/lib/gdm /etc/X11"
 D_RODIRSINRW="etc/gconf etc/X11/xkb /var/adm /var/lib/texmf"
 D_DIRINDXS="/var/X11R6/compose-cache \
 /var/run/sysconfig/tmp /var/adm /var/lib/rpm /var/lib/nobody \
diff --git a/initrd/distro-specs/ubuntu/config-5.10 b/initrd/distro-specs/ubuntu/config-5.10
index 32a63559..551156da 100644
--- a/initrd/distro-specs/ubuntu/config-5.10
+++ b/initrd/distro-specs/ubuntu/config-5.10
@@ -1,5 +1,3 @@
-<<<<<<< .mine
-=======
 # Description:  distro specific settings for Ubuntu Hoary Hedgehog (5.10)
 #               defaults are taken from config-default file
 #
@@ -29,5 +27,4 @@
 # D_BOOTLOCAL - script for user specified stuff which should be started
 # during client bootup, path and file relative to /etc
 
-# no changes from default
->>>>>>> .r256
+# no changes from default except:
diff --git a/initrd/distro-specs/ubuntu/functions-5.10 b/initrd/distro-specs/ubuntu/functions-5.10
index 84cc1eff..76ea7585 100644
--- a/initrd/distro-specs/ubuntu/functions-5.10
+++ b/initrd/distro-specs/ubuntu/functions-5.10
@@ -302,10 +302,11 @@ fi
 
 # configure kdm as display manager
 config_kdm () {
-  ln -sf ../${D_INITDIR}/kdm /mnt/etc/rc3.d/K20kdm
-  echo -e "\t/etc/${D_INITDIR}/kdm start >${LOGFILE} 2>&1\n\
-    \t( sleep 120; ln -sf /etc/${D_INITDIR}/kdm /etc/rc3.d/S01kdm \
-    >${LOGFILE} 2>&1) &\n" >>/mnt/etc/${D_INITDIR}/boot.ld
+ rllinker "kdm" "25" "01"
+#  ln -sf ../${D_INITDIR}/kdm /mnt/etc/rc3.d/K20kdm
+#  echo -e "\t/etc/${D_INITDIR}/kdm start >${LOGFILE} 2>&1\n\
+#    \t( sleep 120; ln -sf /etc/${D_INITDIR}/kdm /etc/rc3.d/S01kdm \
+#    >${LOGFILE} 2>&1) &\n" >>/mnt/etc/${D_INITDIR}/boot.ld
 }
 
 # configure hal, dbus, resmgr and services like that
diff --git a/initrd/initrd-stuff/bin/dhcpmkconfig b/initrd/initrd-stuff/bin/dhcpmkconfig
index bddb6b23..b2ef4e3a 100755
--- a/initrd/initrd-stuff/bin/dhcpmkconfig
+++ b/initrd/initrd-stuff/bin/dhcpmkconfig
@@ -18,6 +18,8 @@ able to\n# transfer any vendor specific, self defined dhcp options. If \
 this is\n# intended, use dhclient instead or get them via tftp (to be \
 enabled\n# via kernel command line)."
 # heavy debugging output in level 3 and above ... and on 13
+#FIXME: DEBUGLEVEL is not propagated to this file (at least for Ubuntu)
+[ -z "$DEBUGLEVEL" ] && DEBUGLEVEL=0
 [ $DEBUGLEVEL -gt 3 -a $DEBUGLEVEL -lt 10 -o $DEBUGLEVEL -eq 13 ] && \
   set -x
 case $0 in
diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init
index 2686cfde..5160d93c 100755
--- a/initrd/initrd-stuff/init
+++ b/initrd/initrd-stuff/init
@@ -469,7 +469,7 @@ waitfor /tmp/svcfg 20000 || error "$init_errsw"
 # should be killed if started within init
 killall -9 dhcpcd dhclient pump 2>/dev/null
 cp /etc/machine-setup /mnt/etc
-
+#bash
 # post init for some distro specific
 postinit
 [ -x /bin/postinit.local ] && /bin/postinit.local
diff --git a/initrd/mkdxsinitrd b/initrd/mkdxsinitrd
index dd5d1045..92ad34c0 100755
--- a/initrd/mkdxsinitrd
+++ b/initrd/mkdxsinitrd
@@ -334,6 +334,7 @@ mkdir -p ${INSTDIR}/usr/share
 mkdir -p ${INSTDIR}/etc/sysconfig
 
 # if still no distro name set, try to find it using significant files
+
 if [ -z "${DISTRO}" ] ; then
   if [ -e ${ROOTDIR}/etc/SuSE-release ] ; then
     DISTRO=suse
@@ -380,7 +381,7 @@ case "${DISTRO}" in
         DISTRO_VER=5.10
         cp ${ROOTDIR}/lib/libnss_compat.so.2 ${INSTDIR}/lib
       ;;
-     Dapper*|dapper*|*)
+     Dapper*|dapper*)
 	DISTRO_VER=6.06
       ;;
     esac
diff --git a/installer/distro-specs/config-ubuntu b/installer/distro-specs/config-ubuntu
index 081ef7f0..b8e4f60b 100644
--- a/installer/distro-specs/config-ubuntu
+++ b/installer/distro-specs/config-ubuntu
@@ -5,4 +5,4 @@ client_conf="/etc/dxs/client.cfg/machine-setup.default"
 
 # this variable choses which atftpd template file to chose
 atftpd_conf_name="atftpd_default"
-root_pw='$1$yhUR.J5f$t4Djzm0SWX1hCmCVoIZ371'
+root_pw='$1$d/bLEPDE$Regn849.F6d.xMA1KffRe0'