3 files changed, 7 insertions, 9 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