diff options
| author | Dirk von Suchodoletz | 2011-03-28 16:49:45 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2011-03-28 16:49:45 +0200 |
| commit | 68ead79ec59605ac81b5a68d9f4d313b5fcadcf7 (patch) | |
| tree | b9a7a7946ba1fa105a980b3269cfbfbb79b6a20e | |
| parent | add support for ubunut 10.10 (diff) | |
| download | core-68ead79ec59605ac81b5a68d9f4d313b5fcadcf7.tar.gz core-68ead79ec59605ac81b5a68d9f4d313b5fcadcf7.tar.xz core-68ead79ec59605ac81b5a68d9f4d313b5fcadcf7.zip | |
Some changes for Ubuntu 10.10 ...
| -rw-r--r-- | src/initramfs/distro-specs/ubuntu/functions-default | 14 | ||||
| -rw-r--r-- | src/initramfs/scripts/etc/functions | 15 |
2 files changed, 18 insertions, 11 deletions
diff --git a/src/initramfs/distro-specs/ubuntu/functions-default b/src/initramfs/distro-specs/ubuntu/functions-default index 316f8c5c..00c6de02 100644 --- a/src/initramfs/distro-specs/ubuntu/functions-default +++ b/src/initramfs/distro-specs/ubuntu/functions-default @@ -1,5 +1,5 @@ # Copyright (c) 2003..2006 - RZ Uni Freiburg -# Copyright (c) 2006..2010 - OpenSLX GmbH +# Copyright (c) 2006..2011 - OpenSLX GmbH # # This program/file is free software distributed under the GPL version 2. # See http://openslx.org/COPYING @@ -326,8 +326,12 @@ config_nis () { } # name service caching daemon (really existing!?) config_nscd () { - #if [ -f /mnt/etc/init.inactive/nscd.conf ] ; then - # testmkd /mnt/var/cache/nscd - #fi - : +# if upstart compatible + if [ -f /mnt/etc/init.inactive/nscd.conf ] ; then + testmkd /mnt/var/cache/nscd + # otherwise the old method + else + ln -sf /etc/init.d/nscd /mnt/etc/rc2.d/S10nscd + ln -sf /etc/init.d/nscd /mnt/etc/rc3.d/S10nscd + fi } diff --git a/src/initramfs/scripts/etc/functions b/src/initramfs/scripts/etc/functions index 717a9c10..b1b82d24 100644 --- a/src/initramfs/scripts/etc/functions +++ b/src/initramfs/scripts/etc/functions @@ -155,12 +155,15 @@ case "${proto}" in # we expect nfs mounts here ... check that nfs module is loaded before cat /proc/filesystems | grep -q -E "[[:space:]]nfs" || \ { modprobe ${MODPRV} nfs 2>/dev/null || error "$error_nfsmod" nonfatal; } - for transport in tcp udp fail; do - [ $transport = "fail" ] && { error "$init_nfs" nonfatal; - noimg=yes; break;} - mount -n -t nfs -o ${mntopt},nolock,${transport} \ - ${server}:${srcpath} ${target} && break - done + # nfs4 seems not supported yet by busybox mount (to be checked) + #for nfsproto in nfs4 nfs; do + for transport in tcp udp fail; do + [ $transport = "fail" ] && { error "$init_nfs" nonfatal; + noimg=yes; break; } + mount -n -t nfs -o ${mntopt},nolock,${transport} \ + ${server}:${srcpath} ${target} && break + done + #done ;; smb|cifs) # cifs mounts might be problematic if accessed with superuser id |