diff options
| author | Dirk von Suchodoletz | 2007-07-19 19:25:27 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2007-07-19 19:25:27 +0200 |
| commit | 6b0ddc3aa261d53068a9f704c30312e64c521b2e (patch) | |
| tree | cb4b84c171b70011129f18b5f9a5fe19c66c8fc5 /initramfs | |
| parent | Xsession in Gentoo fixed (diff) | |
| download | core-6b0ddc3aa261d53068a9f704c30312e64c521b2e.tar.gz core-6b0ddc3aa261d53068a9f704c30312e64c521b2e.tar.xz core-6b0ddc3aa261d53068a9f704c30312e64c521b2e.zip | |
More cleanups regarding uri_token "path" ...
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1260 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs')
| -rwxr-xr-x | initramfs/initrd-stuff/bin/servconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/initramfs/initrd-stuff/bin/servconfig b/initramfs/initrd-stuff/bin/servconfig index 5e676d70..bd123a3e 100755 --- a/initramfs/initrd-stuff/bin/servconfig +++ b/initramfs/initrd-stuff/bin/servconfig @@ -120,7 +120,7 @@ if [ "x$vmware" != "x" ] && [ "x$vmware" != "xno" ] ; then if [ -n "${imgsrv}" ] ; then vmimgprot=$(uri_token $imgsrv prot) vmimgserv=$(uri_token $imgsrv server) - vmimgpath="/$(uri_token $imgsrv path)" + vmimgpath="$(uri_token $imgsrv path)" # on DHCP config systems vmware image server might be coded into the # $vmware variable elif strinstr "/" "$vmware" ; then @@ -257,7 +257,7 @@ if [ -n "${automnt_src}" ] ; then >> /mnt/etc/auto.master echo -e "# /etc/auto.${automnt_dir} created by $0:\n" \ > /mnt/etc/auto.${automnt_dir} - echo -e "*\t-rsize=32768,wsize=32768,rw\t${amserv}:/${ampath}/&" \ + echo -e "*\t-rsize=32768,wsize=32768,rw\t${amserv}:${ampath}/&" \ >> /mnt/etc/auto.${automnt_dir} # no tempfs needed if automounter operates on /home [ "${automnt_dir}" = "home" ] && umount -t tmpfs /mnt/home 2>/dev/null @@ -445,11 +445,11 @@ if [ -n "$scratch" -a -z "$tmpisdisk" ] ; then tmppath=$(uri_token $scratch path) # fixme - use nfsmnt and pass info on rw mount -t nfs -o rw,nolock,intr,nodev,soft,timeo=2,nosuid \ - ${tmpserv}:/${tmppath} /tmp/scratch >/dev/null 2>&1 && { + ${tmpserv}:${tmppath} /tmp/scratch >/dev/null 2>&1 && { mkdir -p /tmp/scratch/${clientip} >/dev/null 2>&1 umount /tmp/scratch mount -t nfs -o rw,nolock,intr,nodev,soft,timeo=2,nosuid \ - ${tmpserv}:/${tmppath}/${clientip} /mnt/tmp >/dev/null 2>&1; } + ${tmpserv}:${tmppath}/${clientip} /mnt/tmp >/dev/null 2>&1; } ;; esac fi |