From 9fe02e2e3a3c054870156ac42a46a7a0f8ac3ccd Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Wed, 16 Jan 2013 18:29:44 +0000 Subject: [PATCH] Replace $installroot with $install in a couple of URL specifications git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14900 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/anaconda.pm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/xCAT-server/lib/xcat/plugins/anaconda.pm b/xCAT-server/lib/xcat/plugins/anaconda.pm index 2b56d7a42..327376d08 100644 --- a/xCAT-server/lib/xcat/plugins/anaconda.pm +++ b/xCAT-server/lib/xcat/plugins/anaconda.pm @@ -1292,10 +1292,16 @@ sub mkinstall $instserver=$ent->{nfsserver}; } + my $httpprefix=$pkgdir; + if ($installroot =~ /\/$/) { + $httpprefix =~ s/^$installroot/\/install\//; + } else { + $httpprefix =~ s/^$installroot/\/install/; + } my $kcmdline = "quiet repo=$httpmethod://$instserver:$httpport$pkgdir ks=$httpmethod://" . $instserver . ":". $httpport - . "$installroot/autoinst/" + . "/install/autoinst/" . $node; if ($maxmem) { $kcmdline.=" mem=$maxmem";