diff options
| author | Michael Janczyk | 2008-06-12 15:34:24 +0200 |
|---|---|---|
| committer | Michael Janczyk | 2008-06-12 15:34:24 +0200 |
| commit | 6a08f37df8df67a017e1a8035dc484806151a1ae (patch) | |
| tree | 18ef9e47fa13aab2487c56c5e6c6276facfccb0b /initramfs | |
| parent | * Minor template change. The old way was "WIndows XP", the "new" way (diff) | |
| download | core-6a08f37df8df67a017e1a8035dc484806151a1ae.tar.gz core-6a08f37df8df67a017e1a8035dc484806151a1ae.tar.xz core-6a08f37df8df67a017e1a8035dc484806151a1ae.zip | |
Solved path / proto problem with file option. Problem was checking after ":" for port, and so paths with "::" werent truncated right. Maybe there exists a nicer solution
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@1877 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs')
| -rw-r--r-- | initramfs/initrd-stuff/etc/functions | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions index c047ce58..a142f5f2 100644 --- a/initramfs/initrd-stuff/etc/functions +++ b/initramfs/initrd-stuff/etc/functions @@ -93,6 +93,12 @@ else rest="$var" prot="" fi +# remove temporary '::' from path, since it conflicts with port specification +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) @@ -117,7 +123,8 @@ fi case "$2" in prot) echo "$prot" ;; server) echo "$server" ;; - path) echo "$path" ;; + # add '::' again to path + path) echo "$path" | sed -e 's,§§§§§,\:\:,g' ;; port) echo "$port" ;; query) echo "$query" ;; esac |