diff options
| author | Michael Janczyk | 2008-09-18 18:39:11 +0200 |
|---|---|---|
| committer | Michael Janczyk | 2008-09-18 18:39:11 +0200 |
| commit | e2fc8b7c90e73d65c52802748f2c2735cf7838b1 (patch) | |
| tree | 97b56adfddd32c6fb5cda3b1dee4d558808de7fc /initramfs/stage3-stuff/etc/functions | |
| parent | * commented out unneded stuff. Could result in an error, even (diff) | |
| download | core-e2fc8b7c90e73d65c52802748f2c2735cf7838b1.tar.gz core-e2fc8b7c90e73d65c52802748f2c2735cf7838b1.tar.xz core-e2fc8b7c90e73d65c52802748f2c2735cf7838b1.zip | |
added modifications from ticket #232 again, since they somehow got lost
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2238 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/stage3-stuff/etc/functions')
| -rw-r--r-- | initramfs/stage3-stuff/etc/functions | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/initramfs/stage3-stuff/etc/functions b/initramfs/stage3-stuff/etc/functions index 5b7b511e..9bb144d2 100644 --- a/initramfs/stage3-stuff/etc/functions +++ b/initramfs/stage3-stuff/etc/functions @@ -89,6 +89,13 @@ else rest="$var" prot="" fi +# remove temporary '::' from path, since it conflicts with port specification +# ticket #232 +if strinstr "::" "$rest" ; then + rest=$(echo $rest | sed -e 's,::,§§§§§,g') +elif strinstr "\:\:" "$rest" ; then + rest=$(echo $rest | sed -e 's,\:\:,§§§§§,g') +fi # get the server IP or name and port - URI authority # you get the path or other token without leading "/" - add it later if # needed (fixme: port might be broken) @@ -113,7 +120,8 @@ fi case "$2" in prot) echo "$prot" ;; server) echo "$server" ;; - path) echo "$path" ;; + # add '::' again to path, ticket #232 + path) echo "$path" | sed -e 's,§§§§§,\:\:,g' ;; port) echo "$port" ;; query) echo "$query" ;; esac |