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

 {

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

-                "libgcc", "libstdc++", 

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

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

-                "coreutils", "grep",

-                "findutils",

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

+                "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",

                 "util-linux", "e2fsprogs",

-                "expat",

+                "libffi", "expat",

                 "linux", "cpio",

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

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

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

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

                 "pcre",

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

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

@@ -277,7 +277,7 @@ class Installer(object):

             retval = process.wait()

         else:

             #Build the initramfs

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

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

             retval = process.wait()

@@ -106,17 +106,9 @@ 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

@@ -35,7 +35,17 @@ fi

 #	Install grub2.

 #

 UUID=$(blkid -s UUID -o value $PARTITION)

-grub2-install --force --boot-directory=$BUILDROOT/boot "$HDD"

+

+grubInstallCmd=""

+ln -sfv grub2 $BUILDROOT/boot/grub

+command -v grub-install >/dev/null 2>&1 && grubInstallCmd="grub-install" && { echo >&2 "Found grub-install"; }

+command -v grub2-install >/dev/null 2>&1 && grubInstallCmd="grub2-install" && { echo >&2 "Found grub2-install"; }

+if [ -z $grubInstallCmd ]; then

+echo "Unable to found grub install command"

+exit 1

+fi

+

+$grubInstallCmd --force --boot-directory=$BUILDROOT/boot "$HDD"

 cp boot/unifont.pf2 ${BUILDROOT}/boot/grub2/

 mkdir -p ${BUILDROOT}/boot/grub2/themes/photon

 cp boot/splash.tga ${BUILDROOT}/boot/grub2/themes/photon/photon.tga