xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-18 04:10:46 +00:00
Code Issues Releases Wiki Activity

support https:// prefix in otherpkgdir and pkgdir; ignore invalid repos

Browse Source
This commit is contained in:
yangsbj
2019-04-17 23:33:12 -04:00
parent 049768fda6
commit 9b41890a2e
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
xCAT-server/share/xcat/netboot/rh/genimage
View File

@ -302,7 +302,7 @@ if($onlyinitrd){
my @pkgdir_internet; #Put all of the http mirrors in this array
my $dir;
foreach $dir (@pkgdirs) {
if ($dir =~ /^http.*/) {
if ($dir =~ /^http[s]?:|^ftp:/) {
push @pkgdir_internet, $dir;
} else {
find(\&isyumdir, <$dir/>);
@ -336,11 +336,11 @@ if($onlyinitrd){
my $repnum = 0;
foreach $srcdir (@yumdirs) {
print $yumconfig "[$osver-$arch-$repnum]\nname=$osver-$arch-$repnum\nbaseurl=file://$srcdir\ngpgpcheck=0\n\n";
print $yumconfig "[$osver-$arch-$repnum]\nname=$osver-$arch-$repnum\nbaseurl=file://$srcdir\ngpgpcheck=0\nskip_if_unavailable=True\n\n";
$repnum += 1;
}
foreach $srcdir (@pkgdir_internet) {
print $yumconfig "[$osver-$arch-$repnum]\nname=$osver-$arch-$repnum\nbaseurl=$srcdir\ngpgpcheck=0\n\n";
print $yumconfig "[$osver-$arch-$repnum]\nname=$osver-$arch-$repnum\nbaseurl=$srcdir\ngpgpcheck=0\nskip_if_unavailable=True\n\n";
$repnum += 1;
}
$repnum -= 1;
@ -486,7 +486,7 @@ if($onlyinitrd){
my @otherpkgdir_url;
my @otherpkgdir_local;
foreach my $tmpdir (split ',', $srcdir_otherpkgs){
if($tmpdir =~ /^http:.*/){
if($tmpdir =~ /^http[s]?:|^ftp:/){
push @otherpkgdir_url, $tmpdir;
}else{
push @otherpkgdir_local,$tmpdir;
@ -516,12 +516,12 @@ if($onlyinitrd){
if (($_ eq "PRE_REMOVE") || ($_ eq "POST_REMOVE") || ($_ eq "ENVLIST")) { next; }
foreach(@otherpkgdir_url){
print $yumconfig "[otherpkgs$index]\nname=otherpkgs$index\nbaseurl=$_\ngpgpcheck=0\n\n";
print $yumconfig "[otherpkgs$index]\nname=otherpkgs$index\nbaseurl=$_\ngpgpcheck=0\nskip_if_unavailable=True\n\n";
$repohash{$pass}{$index} = 1;
$index++;
}
print $yumconfig "[otherpkgs$index]\nname=otherpkgs$index\nbaseurl=file://$srcdir_otherpkgs_local/$_\ngpgpcheck=0\n\n";
print $yumconfig "[otherpkgs$index]\nname=otherpkgs$index\nbaseurl=file://$srcdir_otherpkgs_local/$_\ngpgpcheck=0\nskip_if_unavailable=True\n\n";
$repohash{$pass}{$index} = 1;
$index++;
my $pa = $extra_hash{$pass}{$_};
@ -1161,6 +1161,7 @@ sub mkinitrd_dracut {
}
}
print "\nchroot $rootimg_dir dracut $additional_options -f /tmp/initrd.$$.gz $kernelver\n";
!system("chroot $rootimg_dir dracut $additional_options -f /tmp/initrd.$$.gz $kernelver")
or die("Error: failed to generate the initial ramdisk for $mode.\n");