diff options
| author | Dirk von Suchodoletz | 2006-07-03 00:54:06 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2006-07-03 00:54:06 +0200 |
| commit | f805e05647a7d4a105f094656fa7a421c8a3900c (patch) | |
| tree | 243c6a79306b843e9e0f5e721379b7a2b635ed6c /initrd/initrd-stuff/init | |
| parent | Reenabled the dhcp clients (forgot that after testing, configuring the (diff) | |
| download | core-f805e05647a7d4a105f094656fa7a421c8a3900c.tar.gz core-f805e05647a7d4a105f094656fa7a421c8a3900c.tar.xz core-f805e05647a7d4a105f094656fa7a421c8a3900c.zip | |
Minor fixes for use of unionfs ...
git-svn-id: http://svn.openslx.org/svn/openslx/ld4@264 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd/initrd-stuff/init')
| -rwxr-xr-x | initrd/initrd-stuff/init | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init index cc19feb7..db11a51e 100755 --- a/initrd/initrd-stuff/init +++ b/initrd/initrd-stuff/init @@ -2,12 +2,12 @@ # Description: main script for new type of initial ramdisk for # linux diskless clients version 4 # -# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 29-06-2006 +# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 02-07-2006 # # Copyright: (c) 2006 - RZ Universitaet Freiburg # (c) 2006 - odlx.org project # -# Version: 0.2.4j +# Version: 0.2.4k # functions common for all distros, messages contains all error and info # output @@ -58,6 +58,7 @@ udev_hotplug 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 @@ -309,6 +310,9 @@ if [ -n "${NBD}" ] ; then RDEV=/dev/cow/0 # run ldconfig if not switched off via kernel command line ldcfg + else + # use normal UnionFS behaviour because rootfs is not NFS + NFSRO="" fi # finally mount the block device for i in 50 100 ; do @@ -350,7 +354,6 @@ fi # setup of client root filesystem dependent on the availability of UnionFS if [ -n "${UNIONFS}" ] ; then echo "Using UnionFS for rw access" - [ -n ${NFSROOT} ] && NFSRO=nfs mkdir -p ${RWDIR}/union ${RWDIR}/uniontmp mount -n -t tmpfs none ${RWDIR}/uniontmp mount -n -t unionfs -o dirs=${RWDIR}/uniontmp=rw:/mnt=${NFSRO}ro \ @@ -359,9 +362,15 @@ if [ -n "${UNIONFS}" ] ; then mount -n --move ${RWDIR}/uniontmp /mnt/uniontmp # if additional sources should be used for a combined root filesystem # probably more sources should be merged into union (${UNION} is defined) + # allow more than one union?? if [ -n "${UNION}" ] ; then - # unionctl - : + # mkdir /unionadd + # for dir in ${UNIONDIRS}; do + # mkdir /unionadd/$dir + # mount $dir unionadd/$dir + # unionctl mnt --add --after /mnt --mode ro /unionadd/$dir + # most probably it is a good idea to run ldconfig, so enable it + unset NOLDSC fi # run ldconfig if not switched off via kernel command line ldcfg |