@@ -72,6 +72,7 @@ micro-iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES_MICRO)

                 -l $(PHOTON_STAGE)/LOGS \

                 -r $(PHOTON_STAGE)/RPMS \

                 -p $(PHOTON_GENERATED_DATA_DIR)/$(MICRO_PACKAGE_LIST_FILE) \

+                -c $(PHOTON_GENERATED_DATA_DIR)/$(MICRO_PACKAGE_LIST_FILE) \

                 -o $(PHOTON_STAGE)/common/data \

                 -d $(PHOTON_STAGE)/pkg_info.json \

                 -s $(PHOTON_DATA_DIR) \

@@ -107,6 +108,7 @@ minimal-iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES_MINIMAL)

                 -l $(PHOTON_STAGE)/LOGS \

                 -r $(PHOTON_STAGE)/RPMS \

                 -p $(PHOTON_GENERATED_DATA_DIR)/$(MINIMAL_PACKAGE_LIST_FILE) \

+                -c $(PHOTON_GENERATED_DATA_DIR)/$(MINIMAL_PACKAGE_LIST_FILE) \

                 -o $(PHOTON_STAGE)/common/data \

                 -d $(PHOTON_STAGE)/pkg_info.json \

                 -s $(PHOTON_DATA_DIR) \

@@ -122,6 +124,7 @@ ostree-host-iso: check $(PHOTON_STAGE) ostree-repo

                 -l $(PHOTON_STAGE)/LOGS \

                 -r $(PHOTON_STAGE)/RPMS \

                 -p $(PHOTON_GENERATED_DATA_DIR)/build_install_options_ostreehost.json \

+                -c $(PHOTON_GENERATED_DATA_DIR)/build_install_options_ostreehost.json \

                 -o $(PHOTON_STAGE)/common/data \

 		-s $(PHOTON_DATA_DIR) \

                 -f > \

@@ -136,6 +139,7 @@ live-iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES_MINIMAL) minimal-iso

                 -l $(PHOTON_STAGE)/LOGS \

                 -r $(PHOTON_STAGE)/RPMS \

                 -p $(PHOTON_GENERATED_DATA_DIR)/build_install_options_livecd.json \

+                -c $(PHOTON_GENERATED_DATA_DIR)/build_install_options_livecd.json \

                 -o $(PHOTON_STAGE)/common/data \

                 -d $(PHOTON_STAGE)/pkg_info.json \

                 -s $(PHOTON_DATA_DIR) \

@@ -32,12 +32,6 @@

         "include" : ["minimal"],

         "additional-files" : ["ostree-repo.tar.gz"]

     },

-    "extra" : {

-        "title" : "Extra packages not installed but packed in ISO.",

-        "file" : "packages_extra.json",

-        "visible" : false,

-        "include" : []

-    },

     "appliance" : {

         "title" : "Minimal packages to support appliances.",

         "file" : "packages_appliance.json",

@@ -18,12 +18,6 @@

         "visible" : true,

         "include" : ["minimal"]

     },

-    "extra" : {

-        "title" : "Extra packages not installed but packed in ISO.",

-        "file" : "packages_extra.json",

-        "visible" : false,

-        "include" : []

-    },

     "appliance" : {

         "title" : "Minimal packages to support appliances.",

         "file" : "packages_appliance.json",

deleted file mode 100644

@@ -1,135 +0,0 @@

-{

-    "packages":[

-        "google-daemon",

-        "google-startup-scripts",

-        "autogen",

-        "cronie",

-        "gc",

-        "gnutls",

-        "guile",

-        "json-c",

-        "libestr",

-        "libgcrypt",

-        "liblogging",

-        "librelp",

-        "libtasn1",

-        "libunistring",

-        "nettle",

-        "rsyslog",

-        "device-mapper-multipath",

-        "NetworkManager",

-        "NetworkManager-devel",

-        "dbus-glib",

-        "libndp",

-        "libnl",

-        "dbus-glib-devel",

-        "libndp-devel",

-        "libnl-devel",

-        "logrotate",

-        "sendmail",

-        "kpartx",

-        "autogen-libopts",

-        "autogen-libopts-devel",

-        "gc-devel",

-        "gnutls-devel",

-        "guile-devel",

-        "json-c-devel",

-        "libestr-devel",

-        "libgcrypt-devel",

-        "liblogging-devel",

-        "librelp-devel",

-        "libtasn1-devel",

-        "libunistring-devel",

-        "nettle-devel",

-        "apache-ant",

-        "ant-contrib",

-        "apache-maven",

-        "apache-tomcat",

-        "jna",

-        "gnome-common",

-        "libgudev",

-        "dhcp-client",

-        "dhcp-server",

-        "dhcp-libs",

-        "dhcp-devel",

-        "initscripts",

-        "net-tools",

-        "inotify-tools",

-        "jaxws-ri",

-        "commons-daemon",

-        "runit",

-        "python-pyasn1",

-        "WALinuxAgent",

-        "linux-esx",

-        "python-Twisted",

-        "python-zope.interface",

-        "python-ipaddr",

-        "pycrypto",

-        "chkconfig",

-        "libnss-ato",

-        "procmail",

-        "dmidecode",

-        "iperf",

-        "distrib-compat",

-        "crash",

-        "systemtap",

-        "ktap",

-        "rubygem-backports",

-        "rubygem-builder",

-        "rubygem-highline",

-        "rubygem-terminal-table",

-        "rubygem-libxml-ruby",

-        "rubygem-zip",

-        "rubygem-trollop",

-        "rubygem-nokogiri",

-        "rubygem-mini_portile",

-        "rubygem-rbvmomi",

-        "compat-gdbm",

-        "tiptop",

-        "libssh2",

-        "libssh2-devel",

-        "irqbalance",

-        "lttng-tools",

-        "userspace-rcu",

-        "dstat",

-        "libconfig",

-        "iptraf",

-        "linux-tools",

-        "nicstat",

-        "lldpad",

-        "mingetty",

-        "msr-tools",

-        "zip",

-        "ntpstat",

-        "linux-oprofile",

-        "netcat",

-        "cgroup-utils",

-        "sysstat",

-        "blktrace",

-        "ethtool",

-        "ltrace",

-        "net-snmp",

-        "pcstat",

-        "libseccomp",

-        "sysdig",

-        "iotop",

-        "rsync",

-        "strongswan",

-        "paramiko",

-        "vsftpd",

-        "ecdsa",

-        "kexec-tools",

-        "traceroute",

-        "bindutils",

-        "libusb",

-        "usbutils",

-        "dosfstools",

-        "efibootmgr",

-        "efivar",

-        "grub2-efi",

-        "pciutils",

-        "nginx",

-        "kaigen-gothic-cjk",

-        "python-pip"

-            ]

-}

@@ -34,7 +34,7 @@ class PackageSelector(object):

     def get_packages_to_install(options, config_type, output_data_path):

         package_list = []

         for install_option in options:

-            if install_option[0] == config_type:               

+            if install_option[0] == config_type:

                 for include_type in install_option[1]["include"]:

                     package_list = package_list + PackageSelector.get_packages_to_install(options, include_type, output_data_path)

                 json_wrapper_package_list = JsonWrapper(os.path.join(output_data_path, install_option[1]["file"]))

@@ -167,7 +167,6 @@ def make_src_iso(working_directory, src_iso_path, rpm_list):

     process = subprocess.Popen(['rm', '-rf', options.working_directory])

     retval = process.wait()

-

 if __name__ == '__main__':

     usage = "Usage: %prog [options] <config file> <tools path>"

     parser = OptionParser(usage)

@@ -183,9 +182,9 @@ if __name__ == '__main__':

     parser.add_option("-f", "--force", action="store_true", dest="force", default=False)

     parser.add_option("-p", "--package-list-file", dest="package_list_file", default="../common/data/build_install_options_all.json")

     parser.add_option("-m", "--stage-path", dest="stage_path", default="../stage")

-    parser.add_option("-c", "--dracut-configuration", dest="dracut_configuration_file", default="../common/data/dracut_configuration.json")

     parser.add_option("-s", "--json-data-path", dest="json_data_path", default="../stage/common/data/")

-    parser.add_option("-d", "--pkg-to_rpm-map-file", dest="pkg_to_rpm_map_file", default="../stage/pkg_info.json")

+    parser.add_option("-d", "--pkg-to-rpm-map-file", dest="pkg_to_rpm_map_file", default="../stage/pkg_info.json")

+    parser.add_option("-c", "--pkg-to-be-copied-conf-file", dest="pkg_to_be_copied_conf_file")

     (options,  args) = parser.parse_args()

     # Cleanup the working directory

@@ -195,7 +194,7 @@ if __name__ == '__main__':

             sys.exit(0)

     if options.src_iso_path:

-        rpm_list = create_rpm_list_to_be_copied_to_iso(options.pkg_to_rpm_map_file, options.package_list_file, 4, options.output_data_path)

+        rpm_list = create_rpm_list_to_be_copied_to_iso(options.pkg_to_rpm_map_file, options.pkg_to_be_copied_conf_file, 4, options.output_data_path)

         make_src_iso(options.working_directory, options.src_iso_path, rpm_list)

     else:

@@ -220,8 +219,6 @@ if __name__ == '__main__':

                 print "Unexpected failure, please check the logs"

                 sys.exit(1)

-            config['initrd_dir'] = "/boot"

-

             config['iso_system'] = False

             config['vmdk_install'] = True

@@ -253,13 +250,6 @@ if __name__ == '__main__':

         config['packages'] = packages

-        if options.iso_path:

-            if os.path.isfile(options.dracut_configuration_file):

-                json_wrapper_package_list = JsonWrapper(options.dracut_configuration_file)

-                dracut_configuration_list_json = json_wrapper_package_list.read()

-                config["dracut_configuration"]=dracut_configuration_list_json["dracut_configuration"]

-

-

         if (os.path.isdir(options.working_directory)):

             process = subprocess.Popen(['rm', '-rf', options.working_directory])

             retval = process.wait()

@@ -275,7 +265,7 @@ if __name__ == '__main__':

         # Making the iso if needed

         if options.iso_path:

-            rpm_list = " ".join(create_rpm_list_to_be_copied_to_iso(options.pkg_to_rpm_map_file, options.package_list_file, 3, options.output_data_path))

+            rpm_list = " ".join(create_rpm_list_to_be_copied_to_iso(options.pkg_to_rpm_map_file, options.pkg_to_be_copied_conf_file, 3, options.output_data_path))

             files_to_copy = " ".join(create_additional_file_list_to_copy_in_iso(os.path.abspath(options.stage_path), options.package_list_file))

             live_cd = get_live_cd_status_string(options.package_list_file)

             process = subprocess.Popen(['./mk-install-iso.sh', '-w', options.working_directory, options.iso_path, options.rpm_path, options.package_list_file, rpm_list, options.stage_path, files_to_copy, live_cd, options.json_data_path])