diff options
| author | Dirk von Suchodoletz | 2006-04-11 22:13:35 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2006-04-11 22:13:35 +0200 |
| commit | bff04a5ae648fac46e53a123e3a840bf0c6d59d8 (patch) | |
| tree | 402253f740a56e98a9f42b7a7b44831cb0a7edd4 /initrd/initrd-stuff/init | |
| parent | Some bugfixes and improved robustness against bad ddcprobe output (diff) | |
| download | core-bff04a5ae648fac46e53a123e3a840bf0c6d59d8.tar.gz core-bff04a5ae648fac46e53a123e3a840bf0c6d59d8.tar.xz core-bff04a5ae648fac46e53a123e3a840bf0c6d59d8.zip | |
reboot after leaving debug shell in initrd, mount reordering for UnionFS
git-svn-id: http://svn.openslx.org/svn/openslx/ld4@179 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd/initrd-stuff/init')
| -rwxr-xr-x | initrd/initrd-stuff/init | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init index ef67c9b4..90347ffb 100755 --- a/initrd/initrd-stuff/init +++ b/initrd/initrd-stuff/init @@ -280,7 +280,7 @@ if [ -n "${NBD}" ] ; then RWRO="rw" RDEV=/dev/cow/0 # run ldconfig if not switched off via kernel command line - [ -z "${NOLDSC}" ] && echo $init_ldcfg && ldconfig /etc/ld.so.cache & + ldcfg fi # finally mount the block device mount -n -t $RFST -o $RWRO $RDEV /mnt @@ -315,12 +315,6 @@ if [ -n "${UNIONFS}" -o -n "${UNION}" ] ; then UNIONFS=""; } fi -# if additional sources should be used for a combined root filesystem -# probably more sources should be merged into union (${UNION} is defined) -if [ -n "${UNION}" ] ; then - # unionctl - : -fi # setup of client root filesystem dependent on the availability of UnionFS if [ -n "${UNIONFS}" ] ; then @@ -333,8 +327,14 @@ if [ -n "${UNIONFS}" ] ; then none /mnt mkdir -p /mnt/uniontmp 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) + if [ -n "${UNION}" ] ; then + # unionctl + : + fi # run ldconfig if not switched off via kernel command line - [ -z "${NOLDSC}" ] && echo "$init_ldcfg" && ldconfig /etc/ld.so.cache & + ldcfg elif [ -z "$COWLOOP" ] ; then echo "Using bind mounts to ramdisk for rw access" mount -n -t tmpfs -o size=${TMPFSSIZE} ramfs ${RWDIR} @@ -343,7 +343,7 @@ elif [ -z "$COWLOOP" ] ; then mount -n --bind ${RWDIR}/${path} /mnt/${path} done # see above ... - [ -z "${NOLDSC}" ] && echo "$init_ldcfg" && ldconfig /tmp/ld.so.cache & + ldcfg for path in ${D_RODIRSINRW}; do if [ -d /mnt/${path} ] ; then LIST=${path}" "$LIST |