From 9b41890a2ee87d8cd0a4881251daac77dd9c27f6 Mon Sep 17 00:00:00 2001
From: yangsbj <yangsbj@cn.ibm.com>
Date: Wed, 17 Apr 2019 23:33:12 -0400
Subject: [PATCH] support https:// prefix in otherpkgdir and pkgdir; ignore
 invalid repos

---
 xCAT-server/share/xcat/netboot/rh/genimage | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/xCAT-server/share/xcat/netboot/rh/genimage b/xCAT-server/share/xcat/netboot/rh/genimage
index da8e4117e..42abf3e30 100755
--- a/xCAT-server/share/xcat/netboot/rh/genimage
+++ b/xCAT-server/share/xcat/netboot/rh/genimage
@@ -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");