xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-08-21 10:40:24 +00:00
Code Issues Releases Wiki Activity

Merge pull request #6768 from gurevichmark/gpgp_typo

Browse Source 
Replace misspelled gpgpcheck with gpgcheck
This commit is contained in:
besawn
2020-08-05 09:50:54 -04:00
committed by GitHub
parent 74ead83b22 39e4e982bf
commit fa1b49799a
7 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xCAT-server/share/xcat/netboot/debian/genimage
View File

@@ -266,7 +266,7 @@ unless ($onlyinitrd) {
foreach $pass (sort (keys(%extra_hash))) {
foreach (keys(%{ $extra_hash{$pass} })) {
if (($_ eq "PRE_REMOVE") || ($_ eq "POST_REMOVE")) { next; }
print $yumconfig "[otherpkgs$index]\nname=otherpkgs$index\nbaseurl=file://$srcdir_otherpkgs/$_\ngpgpcheck=0\n\n";
print $yumconfig "[otherpkgs$index]\nname=otherpkgs$index\nbaseurl=file://$srcdir_otherpkgs/$_\ngpgcheck=0\n\n";
$index++;
my $pa = $extra_hash{$pass}{$_};
$extrapkgnames{$pass} .= " " . join(' ', @$pa);

4
xCAT-server/share/xcat/netboot/fedora12/genimage
View File

@@ -178,7 +178,7 @@ unless ($onlyinitrd) {
open($yumconfig, ">", "/tmp/genimage.$$.yum.conf");
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\ngpgcheck=0\n\n";
$repnum += 1;
}
$repnum -= 1;
@@ -263,7 +263,7 @@ unless ($onlyinitrd) {
}
if (($_ eq "PRE_REMOVE") || ($_ eq "POST_REMOVE")) { next; }
print $yumconfig "[otherpkgs$index]\nname=otherpkgs$index\nbaseurl=file://$srcdir_otherpkgs/$_\ngpgpcheck=0\n\n";
print $yumconfig "[otherpkgs$index]\nname=otherpkgs$index\nbaseurl=file://$srcdir_otherpkgs/$_\ngpgcheck=0\n\n";
$index++;
my $pa = $extra_hash{$pass}{$_};
$extrapkgnames{$pass} .= " " . join(' ', @$pa);

4
xCAT-server/share/xcat/netboot/fedora12/geninitrd
View File

@@ -211,7 +211,7 @@ unless ($onlyinitrd) {
open($yumconfig, ">", "/tmp/genimage.$$.yum.conf");
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\ngpgcheck=0\n\n";
$repnum += 1;
}
$repnum -= 1;
@@ -279,7 +279,7 @@ unless ($onlyinitrd) {
foreach $pass (sort (keys(%extra_hash))) {
foreach (keys(%{ $extra_hash{$pass} })) {
if (($_ eq "PRE_REMOVE") || ($_ eq "POST_REMOVE")) { next; }
print $yumconfig "[otherpkgs$index]\nname=otherpkgs$index\nbaseurl=file://$srcdir_otherpkgs/$_\ngpgpcheck=0\n\n";
print $yumconfig "[otherpkgs$index]\nname=otherpkgs$index\nbaseurl=file://$srcdir_otherpkgs/$_\ngpgcheck=0\n\n";
$index++;
my $pa = $extra_hash{$pass}{$_};
$extrapkgnames{$pass} .= " " . join(' ', @$pa);

4
xCAT-server/share/xcat/netboot/mic/genimage
View File

@@ -125,7 +125,7 @@ if ($otherpkglist) {
open($yumconfig, ">", "/tmp/genimage.$$.yum.conf");
my $repnum = 0;
foreach $srcdir (@yumdirs) {
print $yumconfig "[$aiddistro-$repnum]\nname=$aiddistro-$repnum\nbaseurl=file://$srcdir\ngpgpcheck=0\n\n";
print $yumconfig "[$aiddistro-$repnum]\nname=$aiddistro-$repnum\nbaseurl=file://$srcdir\ngpgcheck=0\n\n";
$repnum += 1;
}
$repnum -= 1;
@@ -148,7 +148,7 @@ if ($otherpkglist) {
}
if (($_ eq "PRE_REMOVE") || ($_ eq "POST_REMOVE") || ($_ eq "ENVLIST")) { next; }
print $yumconfig "[otherpkgs$index]\nname=otherpkgs$index\nbaseurl=file://$srcdir_otherpkgs/$_\ngpgpcheck=0\n\n";
print $yumconfig "[otherpkgs$index]\nname=otherpkgs$index\nbaseurl=file://$srcdir_otherpkgs/$_\ngpgcheck=0\n\n";
$repohash{$pass}{$index} = 1;
$index++;
my $pa = $extra_hash{$pass}{$_};

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

@@ -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\nskip_if_unavailable=True\n\n";
print $yumconfig "[$osver-$arch-$repnum]\nname=$osver-$arch-$repnum\nbaseurl=file://$srcdir\ngpgcheck=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\nskip_if_unavailable=True\n\n";
print $yumconfig "[$osver-$arch-$repnum]\nname=$osver-$arch-$repnum\nbaseurl=$srcdir\ngpgcheck=0\nskip_if_unavailable=True\n\n";
$repnum += 1;
}
$repnum -= 1;
@@ -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\nskip_if_unavailable=True\n\n";
print $yumconfig "[otherpkgs$index]\nname=otherpkgs$index\nbaseurl=$_\ngpgcheck=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\nskip_if_unavailable=True\n\n";
print $yumconfig "[otherpkgs$index]\nname=otherpkgs$index\nbaseurl=file://$srcdir_otherpkgs_local/$_\ngpgcheck=0\nskip_if_unavailable=True\n\n";
$repohash{$pass}{$index} = 1;
$index++;
my $pa = $extra_hash{$pass}{$_};

4
xCAT-server/share/xcat/netboot/rh/genimage.rh4
View File

@@ -211,7 +211,7 @@ unless ($onlyinitrd) {
open($yumconfig, ">", "/tmp/genimage.$$.yum.conf");
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\ngpgcheck=0\n\n";
$repnum += 1;
}
$repnum -= 1;
@@ -285,7 +285,7 @@ unless ($onlyinitrd) {
foreach $pass (sort (keys(%extra_hash))) {
foreach (keys(%{ $extra_hash{$pass} })) {
if (($_ eq "PRE_REMOVE") || ($_ eq "POST_REMOVE")) { next; }
print $yumconfig "[otherpkgs$index]\nname=otherpkgs$index\nbaseurl=file://$srcdir_otherpkgs/$_\ngpgpcheck=0\n\n";
print $yumconfig "[otherpkgs$index]\nname=otherpkgs$index\nbaseurl=file://$srcdir_otherpkgs/$_\ngpgcheck=0\n\n";
$index++;
my $pa = $extra_hash{$pass}{$_};
$extrapkgnames{$pass} .= " " . join(' ', @$pa);

4
xCAT-server/share/xcat/netboot/sles/genimage.yum
View File

@@ -116,14 +116,14 @@ unless ($onlyinitrd) {
open($yumconfig, ">", "/tmp/genimage.$$.yum.conf");
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\ngpgcheck=0\n\n";
$repnum += 1;
}
$repnum -= 1;
#add the section for other packages
if ($pkgnames) {
print $yumconfig "[$osver-$arch-otherpkgs]\nname=$osver-$arch-otherpkgs\nbaseurl=file://$srcdir_otherpkgs\ngpgpcheck=0\n\n";
print $yumconfig "[$osver-$arch-otherpkgs]\nname=$osver-$arch-otherpkgs\nbaseurl=file://$srcdir_otherpkgs\ngpgcheck=0\n\n";
}
close($yumconfig);