@@ -1,17 +1,17 @@

 {

     "packages":["glibc", "zlib", "filesystem",

-                "binutils", "gmp", "mpfr", "libgcc", "libstdc++", 

-                "sed", "bzip2", "pkg-config", "readline", "ncurses", "bash",

-                "cracklib", "cracklib-dicts", "cracklib-python", "shadow", "procps-ng", 

-                "coreutils", "iana-etc", "grep", "bc", "libtool",

-                "inetutils", "findutils",

-                "xz", "grub2", "iproute2", "kmod",

+                "libgcc", "libstdc++", 

+                "sed", "pkg-config", "readline", "ncurses", "bash",

+                "cracklib", "cracklib-dicts", "cracklib-python", "shadow", 

+                "coreutils", "grep",

+                "findutils",

+                "xz", "grub2", "kmod",

                 "util-linux", "e2fsprogs",

-                "libffi", "expat",

+                "expat",

                 "linux", "cpio",

                 "Linux-PAM", "attr", "libcap", "systemd", "dbus",

                 "elfutils-libelf", "sqlite-autoconf", "nspr", "nss", "popt", "lua", "rpm",

-                "gptfdisk", "tar", "gzip", "openssl", "python2", "python2-libs", "python-requests",

+                "gptfdisk", "gzip", "openssl", "python2", "python2-libs", "python-requests",

                 "pcre",

                 "libgsystem", "ostree","device-mapper","device-mapper-libs","libsepol","libselinux", 

                 "db", "libsolv", "hawkey", "python-hawkey"]

@@ -269,9 +269,11 @@ class Installer(object):

         #Setup the disk

         process = subprocess.Popen([self.chroot_command, '-w', self.photon_root, self.finalize_command, '-w', self.photon_root], stdout=self.output)

         retval = process.wait()

+        initrd_dir = 'boot'

+        initrd_file_name = 'initrd.img-no-kmods'

         if self.iso_installer:

             # just copy the initramfs /boot -> /photon_mnt/boot

-            shutil.copy('boot/initrd.img-no-kmods', self.photon_root + '/boot/')

+            shutil.copy(os.path.join(initrd_dir, initrd_file_name), self.photon_root + '/boot/')

             # remove the installer directory

             process = subprocess.Popen(['rm', '-rf', os.path.join(self.photon_root, "installer")], stdout=self.output)

             retval = process.wait()

@@ -285,7 +287,9 @@ class Installer(object):

                         if len(version_array) > 2:

                             version_string = version_array[1]

-            process = subprocess.Popen([self.chroot_command, '-w', self.photon_root, './mkinitramfs', '-n', 'boot/initrd.img-no-kmods', '-k', version_string],  stdout=self.output)

+            if 'initrd_dir' in self.install_config:

+                initrd_dir = self.install_config['initrd_dir']

+            process = subprocess.Popen([self.chroot_command, '-w', self.photon_root, './mkinitramfs', '-n', os.path.join(initrd_dir, initrd_file_name), '-k', version_string],  stdout=self.output)

             retval = process.wait()

@@ -106,9 +106,17 @@ createrepo --database ${WORKINGDIR}/RPMS

 rm -rf ${BUILDROOT}/LOGS

+# Cleaning up

 #Remove our rpm database as it fills up the ramdisk

 rm -rf ${BUILDROOT}/home/*

 rm -rf ${BUILDROOT}/var/lib/rpm

+

+# Remove the boot directory

+rm -rf ${BUILDROOT}/boot

+

+#Remove the include files.

+rm -rf ${BUILDROOT}/usr/include

+

 # TODO: mbassiouny, Find a clean way to do that

 for i in `ls ${BUILDROOT}/usr/share/`; do

 	if [ $i != 'terminfo' -a $i != 'cracklib' -a $i != 'grub' ]; then

@@ -127,6 +127,8 @@ 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