diff options
| author | Dirk von Suchodoletz | 2006-11-03 23:37:44 +0100 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2006-11-03 23:37:44 +0100 |
| commit | 3383c5160351eaeb30ae6fd21012828dfcb5fc37 (patch) | |
| tree | 70c7e2d449641109a0b08e45ea88a640a4930b6b /initramfs/initrd-stuff/init | |
| parent | Small fix for output of syslog-ng.conf, comments ... (diff) | |
| download | core-3383c5160351eaeb30ae6fd21012828dfcb5fc37.tar.gz core-3383c5160351eaeb30ae6fd21012828dfcb5fc37.tar.xz core-3383c5160351eaeb30ae6fd21012828dfcb5fc37.zip | |
Fixed nfs mount problem (wrong composition of nfsroot due to changes for
@@@serverip@@@ variable ...)
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@501 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/initrd-stuff/init')
| -rwxr-xr-x | initramfs/initrd-stuff/init | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init index 7b20d904..fb6dc78d 100755 --- a/initramfs/initrd-stuff/init +++ b/initramfs/initrd-stuff/init @@ -2,7 +2,7 @@ # main script for new type of initial ramdisk for OpenSLX linux diskless # clients version 4 # -# Dirk von Suchodoletz <dirk@goe.net>, 29-10-2006 +# Dirk von Suchodoletz <dirk@goe.net>, 03-11-2006 # <mj0@uni-freiburg.de> (xenbr), 27-09-2006 # # (c) 2006 - RZ Universitaet Freiburg @@ -147,7 +147,9 @@ in $0\ncountry=\"${COUNTRY}\"" >> /etc/machine-setup srvproto=$(uri_token $ROOTFS prot) case $srvproto in nfs) - nfsroot=$(uri_token $ROOTFS server)":/"$(uri_token $ROOTFS path) + # nfsroot consists now of two different parts + root_path=/$(uri_token $ROOTFS path) + nfsserver=$(uri_token $ROOTFS server) echo -e "\n# nfs root information gotten via kernel command \ line in $0\nnfsroot=\"${nfsroot}\"\n" >> /etc/machine-setup ;; @@ -179,6 +181,8 @@ line in $0\nnfsroot=\"${nfsroot}\"\n" >> /etc/machine-setup # deprecated: nfs server and path (will be removed soon) nfsroot=*) nfsroot=${opts#nfsroot=} + #root_path= + #nfsserver= echo -e "\n# nfs root information gotten via kernel command line in $0\n\ nfsroot=\"${nfsroot}\"\n" >> /etc/machine-setup ;; @@ -373,9 +377,9 @@ fi # call function for nfs mounts if [ -z "${nbdmod}" -a -z "${nbdserver}" ] ; then . /etc/machine-setup - # check if serverip is set as variable @@@serverip@@@ - serverip=$(checkip $serverip) - nfsroot=${serverip}:${root_path} + # check if nfsserver is set as variable @@@serverip@@@ + nfsserver=$(checkip $nfsserver) + nfsroot=${nfsserver}:${root_path} nfsmnt ${nfsroot} || error "$init_nfs" fi |