summaryrefslogtreecommitdiffstats
path: root/initrd/initrd-stuff/etc
diff options
context:
space:
mode:
authorMichael Janczyk2006-08-31 18:30:16 +0200
committerMichael Janczyk2006-08-31 18:30:16 +0200
commitc10e082c55a72a7557af0f7ab8579fd98f17b73a (patch)
tree3082d561aee895c25ed805af292972094832ed30 /initrd/initrd-stuff/etc
parentForgot to delete Debugmessage (diff)
downloadcore-c10e082c55a72a7557af0f7ab8579fd98f17b73a.tar.gz
core-c10e082c55a72a7557af0f7ab8579fd98f17b73a.tar.xz
core-c10e082c55a72a7557af0f7ab8579fd98f17b73a.zip
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
Diffstat (limited to 'initrd/initrd-stuff/etc')
-rw-r--r--initrd/initrd-stuff/etc/functions2
1 files changed, 1 insertions, 1 deletions
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