From b94a591227c33abc289f84c62f7671618e46c057 Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Wed, 16 Jan 2013 18:44:54 +0000 Subject: [PATCH] Fix sles to deal with alt $installroot git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14901 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/sles.pm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/sles.pm b/xCAT-server/lib/xcat/plugins/sles.pm index f4828d10c..0eadf8d4e 100644 --- a/xCAT-server/lib/xcat/plugins/sles.pm +++ b/xCAT-server/lib/xcat/plugins/sles.pm @@ -986,14 +986,20 @@ sub mkinstall { $netserver = $ent->{nfsserver}; } + my $httpprefix = $pkgdir; + if ($installroot =~ /\/$/) { #must prepend /install/ + $httpprefix =~ s/^$installroot/\/install\//; + } else { + $httpprefix =~ s/^$installroot/\/install/; + } my $kcmdline = "quiet autoyast=$httpmethod://" . $netserver . ":" . $httpport - . "$installroot/autoinst/" + . "/install/autoinst/" . $node . " install=$httpmethod://" . $netserver . ":" . $httpport - . "$pkgdir/1"; + . "$httpprefix/1"; my $netdev = ""; if ($ent->{installnic})