From e2fc8b7c90e73d65c52802748f2c2735cf7838b1 Mon Sep 17 00:00:00 2001
From: Michael Janczyk
Date: Thu, 18 Sep 2008 16:39:11 +0000
Subject: 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
---
 initramfs/stage3-stuff/etc/functions | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'initramfs/stage3-stuff/etc/functions')

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
-- 
cgit v1.2.3-55-g7522