diff options
| -rw-r--r-- | initrd/distro-specs/ubuntu/config-5.10 | 2 | ||||
| -rw-r--r-- | initrd/distro-specs/ubuntu/functions-6.06 | 3 | ||||
| -rw-r--r-- | initrd/distro-specs/ubuntu/functions-default | 1 | ||||
| -rwxr-xr-x | initrd/initrd-stuff/init | 15 |
4 files changed, 13 insertions, 8 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 } diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init index 5160d93c..fe562ce9 100755 --- a/initrd/initrd-stuff/init +++ b/initrd/initrd-stuff/init @@ -46,6 +46,13 @@ echo 256 > /proc/sys/kernel/real-root-dev # redirect console (after /dev/console is available, and /dev mounted) exec < /dev/console > /dev/console 2>&1 +# set defaults and create special files so that "waitfor" does not waites +# for a configuration option +TMPFSSIZE="50%" +COWSIZE="50%" +RWDIR=/dev/shm +NFSRO="nfs" + # run pre init script and user defined preinit.local (see Howto) preinit [ -x /bin/preinit.local ] && /bin/preinit.local @@ -53,12 +60,6 @@ preinit # start device auto discovery service - distro specific function udev_hotplug -# set defaults and create special files so that "waitfor" does not waites -# for a configuration option -TMPFSSIZE="50%" -COWSIZE="50%" -RWDIR=/dev/shm -NFSRO="nfs" # switch off the several configuration methods, will be switched on # according to kernel commandline settings echo "noldap" > /tmp/ldap-done @@ -355,7 +356,7 @@ if [ -n "${UNIONFS}" ] ; then mount -n -t tmpfs none ${RWDIR}/uniontmp # hack for handling unionfs with patched run-init mount -n --move /mnt /rorootfs - mount -n -t unionfs -o dirs=${RWDIR}/uniontmp=rw:/rorootfs=${NFSRO}ro \ + mount -n -t unionfs -o dirs=${RWDIR}/uniontmp:/rorootfs=${NFSRO}ro \ none /mnt mkdir -p /mnt/uniontmp mount -n --move ${RWDIR}/uniontmp /mnt/uniontmp |