@@ -242,26 +242,19 @@ class Installer(object):

     def copy_rpms(self):

         # prepare the RPMs list

-        rpms = []

-        for root, dirs, files in os.walk(self.rpm_path):

-            for name in files:

-                file = os.path.join(root, name)

-                size = os.path.getsize(file)

-                rpms.append({'filename': name, 'path': file, 'size': size})

+        json_pkg_to_rpm_map = JsonWrapper(self.install_config["pkg_to_rpm_map_file"])

+        pkg_to_rpm_map = json_pkg_to_rpm_map.read()

         self.rpms_tobeinstalled = []

         selected_packages = self.install_config['packages']

-        for package in selected_packages:

-            pattern = package + '-[0-9]*.rpm'

-            if (package == 'glibc'):

-                pattern2 = pattern

-            else:

-                pattern2 = package + '-[a-z][0-9]*.rpm'

-            for rpm in rpms:

-                if fnmatch.fnmatch(rpm['filename'], pattern) or fnmatch.fnmatch(rpm['filename'], pattern2):

-                    rpm['package'] = package

-                    self.rpms_tobeinstalled.append(rpm)

-                    break

+

+        for pkg in selected_packages: 

+            if pkg in pkg_to_rpm_map:

+                if not pkg_to_rpm_map[pkg]['rpm'] is None:

+                    name = pkg_to_rpm_map[pkg]['rpm']

+                    basename = os.path.basename(name)

+                    self.rpms_tobeinstalled.append({'filename': basename, 'path': name, 'package' : pkg})

+

         # Copy the rpms

         for rpm in self.rpms_tobeinstalled:

             shutil.copy(rpm['path'], self.photon_root + '/RPMS/')

@@ -227,6 +227,7 @@ if __name__ == '__main__':

             config['iso_system'] = False

             config['vmdk_install'] = False

+        config["pkg_to_rpm_map_file"] = options.pkg_to_rpm_map_file

         if 'password' in config:

             # crypt the password if needed

             if config['password']['crypted']:

@@ -59,7 +59,7 @@ if [ -n "$ADDITIONAL_RPMS_PATH" ]

     cp -f $ADDITIONAL_RPMS_PATH/* $PHOTON_STAGE_PATH/RPMS/additional/

 fi

-./photonInstaller.py -p $GENERATED_DATA_PATH/build_install_options_$IMG_NAME.json -r $PHOTON_STAGE_PATH/RPMS -v $WORKING_DIR/photon-${IMG_NAME} -o $GENERATED_DATA_PATH -f $VMDK_CONFIG_SAFE_FILE

+./photonInstaller.py -p $GENERATED_DATA_PATH/build_install_options_$IMG_NAME.json -r $PHOTON_STAGE_PATH/RPMS -v $WORKING_DIR/photon-${IMG_NAME} -o $GENERATED_DATA_PATH -d $PHOTON_STAGE_PATH/pkg_info.json -f $VMDK_CONFIG_SAFE_FILE

 cat $VMDK_CONFIG_SAFE_FILE

 rm $VMDK_CONFIG_SAFE_FILE