diff options
| author | Dirk von Suchodoletz | 2006-02-03 20:52:42 +0100 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2006-02-03 20:52:42 +0100 |
| commit | 6d17fdc7f0e548131acf803d93e890f8124ccc58 (patch) | |
| tree | 09d336930c3ec94ea055d6ed0842893ecd6feae5 /initrd/initrd-stuff/init | |
| parent | und noch der eigentliche commit... (diff) | |
| download | core-6d17fdc7f0e548131acf803d93e890f8124ccc58.tar.gz core-6d17fdc7f0e548131acf803d93e890f8124ccc58.tar.xz core-6d17fdc7f0e548131acf803d93e890f8124ccc58.zip | |
Fixed bug in mkdxsinitrd - if link of a binary is copied you get the
binary from the server instead of client root - problem on different
architectures. Some minor bugfixes in other files ...
git-svn-id: http://svn.openslx.org/svn/openslx/dxs/ld4@57 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd/initrd-stuff/init')
| -rwxr-xr-x | initrd/initrd-stuff/init | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init index d8fe2355..4859efb4 100755 --- a/initrd/initrd-stuff/init +++ b/initrd/initrd-stuff/init @@ -2,7 +2,7 @@ # Description: main script for new type of initial ramdisk for # linux diskless clients version 4 # -# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 31-01-2006 +# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 03-02-2006 # Bla # Blub # @@ -215,7 +215,7 @@ as root filesystem." echo "Diskless client using ${NBD} server $nbdhost:$nbdport,$nbdfs" if [ -z "$nbdfs" ]; then RFST=ext2; - else + else RFST=$nbdfs; modprobe ${MODPRV} ${RFST} || error " Failed to load the requested \ filesystem module for the client root\n filesystem ontop of the (D)NBD." @@ -238,8 +238,8 @@ filesystem module for the client root\n filesystem ontop of the (D)NBD." usleep 20 ;; esac + mount -o ro $RDEV /mnt fi - # if no type of root filesystem is passed via kernel command line try # information gathered from dhcp process if [ -z "${DNBDOPT}" -a -z "${NBDOPT}" -a -z "${NFSROOT}" ] ; then @@ -389,6 +389,7 @@ of this client did not finish in\n time. You might check the process list \ and list the modules loaded until\n now." # close runlevel script for stuff to execute during early bootup d_mkbootld close +ash # IP configuration is made and should not be updated automatically, udevd # should be killed if started within init killall -9 dhcpcd dhclient pump 2>/dev/null |