fix bug 4395: ubuntu didn't get pkgdir from the osimage pkdir attribute

xCAT-server/lib/perl/xCAT/Template.pm

@@ -231,6 +231,9 @@ sub subvars {
     
           $inc =~ s/#INSTALL_SOURCES#/$source/g;
           $inc =~ s/#INSTALL_SOURCES_IN_PRE#/$source_in_pre/g;
+          if (("ubuntu" eq $platform) || ("debian" eq $platform)) {
+              $inc =~ s/#INCLUDE_OSIMAGE_PKGDIR#/$pkgdirs[-1]/;
+          }
       }
     
       #ok, now do everything else..

xCAT-server/lib/xcat/plugins/debian.pm

@@ -661,7 +661,7 @@ sub mkinstall
                 "$installroot/autoinst/" . $node,
                 $node,
 	    		$pkglistfile,
-		    	"",
+		        $pkgdir,
 			    $platform
                 );
         }

xCAT-server/share/xcat/install/ubuntu/compute.tmpl

@@ -18,7 +18,7 @@ d-i netcfg/dhcp_timeout string 120
 
 d-i mirror/country string manual
 d-i mirror/protocol string http
-d-i mirror/http/directory string /install/#TABLE:nodetype:$NODE:os#/#TABLE:nodetype:$NODE:arch#
+d-i mirror/http/directory string #INCLUDE_OSIMAGE_PKGDIR#
 d-i mirror/http/proxy string
 
 # Suite to install.