Ubuntu 5.10: working

Ubuntu 6.06: still problems with gdm


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

3 files changed, 5 insertions, 1 deletions

diff --git a/initrd/distro-specs/ubuntu/config-5.10 b/initrd/distro-specs/ubuntu/config-5.10
index 551156da..4b9f1fec 100644
--- a/initrd/distro-specs/ubuntu/config-5.10
+++ b/initrd/distro-specs/ubuntu/config-5.10
@@ -27,4 +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 except:
+# no changes from default:
diff --git a/initrd/distro-specs/ubuntu/functions-6.06 b/initrd/distro-specs/ubuntu/functions-6.06
index 7ca485fe..7ccec7de 100644
--- a/initrd/distro-specs/ubuntu/functions-6.06
+++ b/initrd/distro-specs/ubuntu/functions-6.06
@@ -15,6 +15,8 @@ preinit () {
   echo "Creating dhcp user"
   echo "dhcp:x:101:" >>/etc/group
   echo "dhcp:x:101:101::/nonexistent:/bin/false" >>/etc/passwd
+  # mount/unionfs can not handle the nfsro parameter in Ubuntu 6.06 
+  NFSRO=""
 }
 
 # distro specific function called from servconfig script
@@ -160,6 +162,7 @@ rllinker "console-screen.sh" "31" "03"
 # configure gdm as display manager
 config_gdm () {
 rllinker "gdm" "13" "01"
+ln -sf ../${D_INITDIR}/gdm /mnt/etc/rc3.d/K20gdm
 #  ln -sf ../${D_INITDIR}/gdm /mnt/etc/rc3.d/S13gdm
 #  ln -sf ../${D_INITDIR}/gdm /mnt/etc/rc6.d/K01gdm
   echo -e "\t/etc/${D_INITDIR}/gdm start >${LOGFILE} 2>&1\n\
diff --git a/initrd/distro-specs/ubuntu/functions-default b/initrd/distro-specs/ubuntu/functions-default
index 2def5937..e24c802c 100644
--- a/initrd/distro-specs/ubuntu/functions-default
+++ b/initrd/distro-specs/ubuntu/functions-default
@@ -80,6 +80,7 @@ for i in rc2.d/K$stop$script rc3.d/K$stop$script \
     break
   else 
     ln -sf ../init.d/$script /mnt/etc/$i
+    echo "Linked $script"
   fi
 done
 }