diff options
| author | Dirk von Suchodoletz | 2007-07-19 19:22:19 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2007-07-19 19:22:19 +0200 |
| commit | 76844afa5692effee6d167ebf21e80e37b30f1ee (patch) | |
| tree | 0730373e4db8b702f34d38711285296d8974994e /initramfs/initrd-stuff/init | |
| parent | Rewrite of tftp fileget - should be possible to use other servers than (diff) | |
| download | core-76844afa5692effee6d167ebf21e80e37b30f1ee.tar.gz core-76844afa5692effee6d167ebf21e80e37b30f1ee.tar.xz core-76844afa5692effee6d167ebf21e80e37b30f1ee.zip | |
Repaired uri_token function (no prepend of leading slash is required any
more)
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1258 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/initrd-stuff/init')
| -rwxr-xr-x | initramfs/initrd-stuff/init | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init index 0e3ed439..80d38e8b 100755 --- a/initramfs/initrd-stuff/init +++ b/initramfs/initrd-stuff/init @@ -204,7 +204,7 @@ in $0\ncountry=\"${COUNTRY}\"" >> /etc/machine-setup case $srvproto in nfs) # nfsroot consists now of two different parts - nfspath=/$(uri_token $rootfs path) + nfspath=$(uri_token $rootfs path) nfsserver=$(uri_token $rootfs server) echo -e "\n# nfs root information gotten via kernel command \ line in $0\n#nfsroot=\"${nfsserver}:${nfspath}\"\n" >> /etc/machine-setup @@ -212,10 +212,11 @@ line in $0\n#nfsroot=\"${nfsserver}:${nfspath}\"\n" >> /etc/machine-setup *nbd*) nbdmod=$srvproto # get settings for nbd-client, filesystem equals to path in URI - # notation + # notation (remove leading slash from filesystem at the end) nbdhost=$(uri_token $rootfs server) nbdport=$(uri_token $rootfs port) nbdrfst=$(uri_token $rootfs path) + nbdrfst=${nbdrfst#/*} ;; aoe) echo "Not implemented yet" @@ -385,7 +386,7 @@ if [ -n "${nbdmod}" ] ; then # load block device driver if needed modprobe ${MODPRV} ${nbdmod} || error "$init_errnbd" [ -x /bin/mdev ] && mdev -s - [ -z "$nbdrfst" ] && nbdrfst=ext2 + [ -z "$nbdrfst" ] && nbdrfst=squashfs nbdhost=$(checkip $nbdhost) if [ $DEBUGLEVEL -eq 20 ] ; then echo "** starting setup of ${nbdmod} at $(sysup)" |