From 4fa363e910853d714bb96e36576f086fa9369f64 Mon Sep 17 00:00:00 2001 From: jjhua <jjhua@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd> Date: Wed, 10 Jul 2013 09:07:11 +0000 Subject: [PATCH] fixed bug 3682. In some case, the attribute BOOT_IMAGE added into the /proc/cmdline, using another method to get the nex-server value to fix this issue. git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@16928 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/share/xcat/install/scripts/pre.sles | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-server/share/xcat/install/scripts/pre.sles b/xCAT-server/share/xcat/install/scripts/pre.sles index 055fcd393..8951c234d 100644 --- a/xCAT-server/share/xcat/install/scripts/pre.sles +++ b/xCAT-server/share/xcat/install/scripts/pre.sles @@ -171,7 +171,7 @@ if [ -r "/tmp/partitionfile" ]; then sed -e 's!xcattempspace! !g' /tmp/profile/modified1.xml > /tmp/profile/modified.xml fi -export nextserver=`cat /proc/cmdline | grep http | head -n 1 | cut -d / -f 3 | cut -d : -f 1` +export nextserver=`cat /proc/cmdline | grep http | awk -F'autoyast=http://' {'print \$2'} | awk -F':' {'print \$1'}` cp /tmp/profile/modified.xml /tmp/profile/modified1.xml sed -e 's!<software>!<add-on><add_on_products config:type="list">#INSTALL_SOURCES_IN_PRE#</add_on_products></add-on><software>!' /tmp/profile/modified1.xml > /tmp/profile/modified.xml ]]>