From 2bd784567375b29fdfafb80a29bd92df9023fd9b Mon Sep 17 00:00:00 2001 From: linggao Date: Thu, 22 Jan 2015 12:23:34 -0500 Subject: [PATCH] Fix sles sdk support --- xCAT-server/share/xcat/netboot/sles/genimage | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/xCAT-server/share/xcat/netboot/sles/genimage b/xCAT-server/share/xcat/netboot/sles/genimage index 15caac5a6..75e3b6967 100755 --- a/xCAT-server/share/xcat/netboot/sles/genimage +++ b/xCAT-server/share/xcat/netboot/sles/genimage @@ -273,15 +273,16 @@ unless ($onlyinitrd) { #if(-e "$rootimg_dir/etc/zypp/repos.d/${osver}sdk.repo") { # system("rm -rf $rootimg_dir/etc/zypp/repos.d/${osver}sdk.repo"); #} - my $index=1; - while (1) { - my $srcdir_sdk = "$installroot/$osver/$arch/sdk$index"; - if ( -e "$srcdir_sdk") { - system("zypper -R $rootimg_dir $non_interactive ar file:$srcdir_sdk ${osver}sdk$index"); - $index++; - } else { last; } + if (opendir(SRCDIR, "$installroot/$osver/$arch/")) { + while (my $tmpfile = readdir(SRCDIR)) { + if ($tmpfile =~ m/^sdk/) { + my $srcdir_sdk = "$installroot/$osver/$arch/${tmpfile}"; + if ( -d "$srcdir_sdk") { + system("zypper -R $rootimg_dir $non_interactive ar file:$srcdir_sdk ${osver}${tmpfile}"); + } + } + } } - }else { $srcdir = $srcdir . "/1"; system("zypper -R $rootimg_dir $non_interactive sa file:$srcdir");