From 2a494808f72593f4017bde27a86cdc79efcefcc0 Mon Sep 17 00:00:00 2001
From: immarvin <yangsbj@cn.ibm.com>
Date: Wed, 15 Oct 2014 08:42:35 -0700
Subject: [PATCH] fix defect #4293 [[FVT]:genimage failed not finding otherpkg
 repo file

---
 xCAT-server/share/xcat/netboot/ubuntu/genimage | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/xCAT-server/share/xcat/netboot/ubuntu/genimage b/xCAT-server/share/xcat/netboot/ubuntu/genimage
index 204b3fc86..b4c350292 100755
--- a/xCAT-server/share/xcat/netboot/ubuntu/genimage
+++ b/xCAT-server/share/xcat/netboot/ubuntu/genimage
@@ -338,9 +338,10 @@ unless ($onlyinitrd) {
 
     #add the other package directory to for apt-get install
     open ($aptconfig,">","$rootimg_dir/etc/apt/sources.list.d/genimage.apt.list");
-    if ($otherpkgsdir_local){
-        print $aptconfig "deb file://$otherpkgsdir_local ./\n";
-    }
+    #if ($otherpkgsdir_local){
+    #   # print $aptconfig "deb file://$otherpkgsdir_local ./\n";
+    #   print $aptconfig "deb file:///mnt/otherpkgdir/ ./\n";
+    #}
     if ($otherpkgsdir_internet){
         print $aptconfig $otherpkgsdir_internet;
     }
@@ -367,6 +368,7 @@ unless ($onlyinitrd) {
     my %extrapkgnames; 
 
     if (keys(%extra_hash) > 0) {
+      open ($aptconfig,">","$rootimg_dir/etc/apt/sources.list.d/genimage.apt.list");
       my $index=1;
       foreach $pass (sort {$a <=> $b} (keys(%extra_hash))) {
         foreach (keys(%{$extra_hash{$pass}})) {
@@ -376,11 +378,13 @@ unless ($onlyinitrd) {
             }
 
             if (($_ eq "PRE_REMOVE") || ($_ eq "POST_REMOVE") || ($_ eq "ENVLIST")) { next;} 
+            if ($otherpkgsdir_local) { print $aptconfig "deb file:///mnt/otherpkgdir/$_ ./\n"};
             $index++;
             my $pa=$extra_hash{$pass}{$_};
             $extrapkgnames{$pass} .= " " . join(' ', @$pa);
         }
       }
+      close($aptconfig);
       $index--;
 
       foreach $pass (sort {$a <=> $b} (keys(%extra_hash))) {
@@ -403,7 +407,9 @@ unless ($onlyinitrd) {
 
           # install extra packages
           my $aptgetcmd_base = $aptgetcmd;
-          $aptgetcmd .= " install ";
+          # to prevent "The following packages cannot be authenticated" error, 
+          # invoke apt-get with "--allow-unauthenticated" option
+          $aptgetcmd .= " install --allow-unauthenticated ";
           # append extra pkg names to yum command 
           if ($extrapkgnames{$pass}) {
               $aptgetcmd .= " $extrapkgnames{$pass} ";