diff options
| author | Dirk von Suchodoletz | 2006-07-15 13:22:25 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2006-07-15 13:22:25 +0200 |
| commit | 8496797591fe6c68608209fa6884f1e5a42b4588 (patch) | |
| tree | c87ee23db9f3de6f0aeea2007e70bc6fad037019 /initrd/initrd-stuff/init | |
| parent | Added "fileget" configuration (via tftp from ~/tftpboot/client-config/*), (diff) | |
| download | core-8496797591fe6c68608209fa6884f1e5a42b4588.tar.gz core-8496797591fe6c68608209fa6884f1e5a42b4588.tar.xz core-8496797591fe6c68608209fa6884f1e5a42b4588.zip | |
Trying on fix for #65 (different handling of kbd settings for SuSE
distros), minor other fixes and additions ...
git-svn-id: http://svn.openslx.org/svn/openslx/ld4@281 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd/initrd-stuff/init')
| -rwxr-xr-x | initrd/initrd-stuff/init | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init index 44c3fe27..2cbc49cd 100755 --- a/initrd/initrd-stuff/init +++ b/initrd/initrd-stuff/init @@ -234,6 +234,7 @@ fi if [ -n "$noipyet" ] ; then waitfor /tmp/dhcp-done 20000 . /etc/machine-setup + [ -f /tmp/confviadhcp ] && . /tmp/confviadhcp [ -z "$clientip" -o -z "$subnet_mask" -o -z "$gateway" \ -o -z "$broadcast_address" ] && error "$init_errdhcp" ipsetup $clientip $subnet_mask $gateway $broadcast_address eth0 @@ -358,7 +359,7 @@ if [ -n "${UNIONFS}" ] ; then mkdir -p ${RWDIR}/union ${RWDIR}/uniontmp /rorootfs mount -n -t tmpfs none ${RWDIR}/uniontmp # hack for handling unionfs with patched run-init - mount --move /mnt /rorootfs + mount -n --move /mnt /rorootfs mount -n -t unionfs -o dirs=${RWDIR}/uniontmp=rw:/rorootfs=${NFSRO}ro \ none /mnt mkdir -p /mnt/uniontmp @@ -367,9 +368,8 @@ if [ -n "${UNIONFS}" ] ; then # probably more sources should be merged into union (${UNION} is defined) # allow more than one union?? if [ -n "${UNION}" ] ; then - # mkdir /unionadd - # for dir in ${UNIONDIRS}; do - # mkdir /unionadd/$dir + # for dir in "${UNION}"; do + # testmkd /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 |