From c10e082c55a72a7557af0f7ab8579fd98f17b73a Mon Sep 17 00:00:00 2001
From: Michael Janczyk
Date: Thu, 31 Aug 2006 16:30:16 +0000
Subject: Fixing error in uri_token function (server was not read correctly),
 adding possibility to provide Xorg config file via ConfTGZ (if
 /rootfs${D_XF86CONFFILE is present the automatic configuration is NOT run
 anymore - nothing changes if not provided. Xorg configs from stage1, stage2
 exports are ignored) ...

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@349 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initrd/initrd-stuff/etc/functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'initrd/initrd-stuff/etc/functions')

diff --git a/initrd/initrd-stuff/etc/functions b/initrd/initrd-stuff/etc/functions
index 81308e4c..7357b982 100644
--- a/initrd/initrd-stuff/etc/functions
+++ b/initrd/initrd-stuff/etc/functions
@@ -133,8 +133,8 @@ if strinstr ":" "$rest" ; then
 else
   tmpval=$rest
   rest="${rest#*/}"
-  server="${tmpval%/*}"
   path="${tmpval#*/}"
+  server="${tmpval%/$path}"
   port=""
 fi
 # get path and query components - URI path, query
-- 
cgit v1.2.3-55-g7522