new file mode 100644

@@ -0,0 +1,44 @@

+Summary:	initramfs

+Name:		initramfs

+Version:	1.0

+Release:	1%{?dist}

+License:	Apache License

+Group:		System Environment/Base

+Source:		photon-release-1.0.2.tar.gz

+%define sha1 photon-release=4c03ec658315e25873e5e5f3e77c0006ddfeecc6

+Vendor:		VMware, Inc.

+Distribution:	Photon

+Provides:	initramfs

+BuildRequires:       linux

+BuildRequires:       dracut

+BuildRequires:       ostree

+

+%description

+Photon release files such as yum configs and other /etc/ release related files

+

+%prep

+%setup -q -n photon-release-1.0.2

+echo 'add_drivers+="tmem xen-acpi-processor xen-evtchn xen-gntalloc xen-gntdev xen-privcmd xen-pciback xenfs hv_ballon hv_utils hv_vmbus cn"' >> /etc/dracut.conf

+

+echo 'add_dracutmodules+=" ostree systemd "' > /etc/dracut.conf.d/ostree.conf

+

+%build

+dracut --force --kver  4.2.0 initrd.img-no-kmods 

+%install

+rm -rf $RPM_BUILD_ROOT

+install -d $RPM_BUILD_ROOT/boot

+install -m 600 initrd.img-no-kmods $RPM_BUILD_ROOT/boot/initrd.img-no-kmods

+

+%post

+

+%clean

+rm -rf $RPM_BUILD_ROOT

+

+%files

+%defattr(-,root,root,-)

+%dir /boot

+/boot/initrd.img-no-kmods 

+

+%changelog

+*  		Thu Mar 24 2016 Xiaolin Li <xiaolinl@vmware.com> 1.0-1

+-		Initial version.

\ No newline at end of file

@@ -1,18 +1,9 @@

 {   

-    "packages": ["gc", "gmp", "libgcc", "libunistring", "libltdl", "libstdc++", "libffi",

-            "xz", "attr", "openssl", "pcre", "guile", "ca-certificates",

-            "kmod", "glib", "autogen", "libtasn1", "bzip2", "libcap", "Linux-PAM",

-            "nettle", "filesystem", "systemd", "gnutls", "python2", "glibc", "libgpg-error",

-            "bash", "libassuan", "gpgme", "libsolv", "util-linux", "glib-networking",

-            "openssl-devel", "libselinux", "libxml2", "expat", "curl", "coreutils",

-            "libsepol", "popt", "gobject-introspection", "rpm-devel", "db", "sqlite-autoconf",

-            "nspr", "libxml2-devel", "hawkey-devel", "lua", "libarchive", "nss", "rpm", "librepo",

-            "librepo-devel", "dracut", "cracklib", "ncurses", "zlib", "file", "elfutils-libelf",

-            "libsoup", "device-mapper-libs", "hawkey", "readline", "libsoup-devel", "device-mapper",

-            "mkinitcpio", "python2-libs", "python-xml", "dracut-tools", "libgsystem", "nettle-devel", "libhif",

-            "libtasn1-devel", "libarchive-devel", "cracklib-dicts", "findutils", "efivar", "grub2",

-            "cpio", "shadow", "dbus", "python-requests", "pkg-config", "dosfstools", "sed", "json-glib",

-            "python-hawkey", "libhif-devel", "grub2-efi", "linux", "cracklib-python", "gpgme-devel",

-            "grep", "ostree", "tar", "efibootmgr", "pciutils", "gnutls-devel", "e2fsprogs", "gzip", 

-            "gptfdisk", "tdnf", "python-curses"]

+    "packages": ["glibc","zlib","filesystem","file","gmp","libgcc","libstdc++","bash","sed",

+                  "bzip2","pkg-config","ncurses","cracklib","cracklib-dicts","cracklib-python",

+                  "shadow","coreutils","grep","readline","findutils","xz","util-linux","e2fsprogs",

+                  "libffi","expat","linux","cpio","Linux-PAM","attr","libcap", "systemd","dbus",

+                  "gzip", "sqlite-autoconf","nspr","nss","popt","lua","rpm","gptfdisk","tar", "librepo", 

+                  "hawkey", "python2","python2-libs","pcre","glib", "tdnf", "python-requests", 

+                  "grub2","dracut", "curl", "ostree"]

 }

@@ -8,7 +8,8 @@

                 "linux", 

                 "iptables", "ca-certificates",

                 "dbus", "docker",

-                "photon-release", "photon-repos"

+                "photon-release", "photon-repos",

+                "initramfs"

                 ]

 }

@@ -9,7 +9,7 @@

                 "open-vm-tools",

                 "docker","bridge-utils",

                 "cloud-init",

-                "krb5", "which"]

+                "krb5", "which", "initramfs"]

 }

new file mode 100644

Binary files /dev/null and b/installer/boot/splash.png differ

deleted file mode 100644

Binary files a/installer/boot/splash.tga and /dev/null differ

@@ -1,4 +1,4 @@

-desktop-image: "photon.tga"

+desktop-image: "photon.png"

 desktop-color: "#FFFFFF"

 title-text : " "

 terminal-box : "terminal_*.tga" 

@@ -17,7 +17,6 @@ import signal

 import sys

 import glob

 import modules.commons

-import xml.etree.ElementTree as ET

 from jsonwrapper import JsonWrapper

 from progressbar import ProgressBar

 from window import Window

@@ -104,6 +103,13 @@ class Installer(object):

                 if retval != 0:

                     modules.commons.log(modules.commons.LOG_INFO, "Failed to reset repo")

                     self.exit_gracefully(None, None)

+

+            cmdoption = 's/cachedir=\/var/cachedir={}/g'.format(self.photon_root.replace('/','\/'))

+            process = subprocess.Popen(['sed', '-i', cmdoption,'/etc/tdnf/tdnf.conf']) 

+            retval = process.wait()

+            if retval != 0:

+                modules.commons.log(modules.commons.LOG_INFO, "Failed to reset tdnf cachedir")

+                self.exit_gracefully(None, None)

         self.execute_modules(modules.commons.PRE_INSTALL)

         self.initialize_system()

@@ -281,11 +287,7 @@ 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(os.path.join(initrd_dir, initrd_file_name), self.photon_root + '/boot/')

             modules.commons.dump(modules.commons.LOG_FILE_NAME)

             shutil.copy(modules.commons.LOG_FILE_NAME, self.photon_root + '/var/log/')

@@ -296,39 +298,11 @@ class Installer(object):

             # remove the installer directory

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

             retval = process.wait()

-        elif not self.install_config['vmdk_install']:

-            #Build the initramfs by passing in the kernel version

-            version_string = ''	

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

-                for name in files:

-                    if fnmatch.fnmatch(name, 'linux-[0-9]*.rpm'):

-                        version_array = name.split('-')

-                        if len(version_array) > 2:

-                            version_string = version_array[1]

-

-            if 'initrd_dir' in self.install_config:

-                initrd_dir = self.install_config['initrd_dir']

-            self.add_dracut_configuration()

-            process = subprocess.Popen([self.chroot_command, '-w', self.photon_root, 'dracut', '--force', '--kver', version_string, os.path.join(initrd_dir,initrd_file_name)],  stdout=self.output, stderr=self.output)

+            # Disable the swap file

+            process = subprocess.Popen(['swapoff', '-a'], stdout=self.output)

             retval = process.wait()

-

-    def add_dracut_configuration(self):

-        if self.install_config.has_key("dracut_configuration"):

-            dracut_configuration = []

-            

-            for key in self.install_config["dracut_configuration"].keys():

-                keyValue = self.install_config["dracut_configuration"][key]

-                config=key

-                if isinstance(keyValue,list):

-                    config=config+'+="'+" ".join(keyValue)+'"'

-                else:

-                    config=config+'="'+keyValue+'"'

-                config=config+"\n"

-                dracut_configuration.append(config)

-            

-            f = open(self.photon_root+"/etc/dracut.conf","a")

-            f.writelines(dracut_configuration)

-        

+            # remove the tdnf cache directory and the swapfile.

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

     def install_package(self,  package_name):

         rpm_params = ''

@@ -39,6 +39,7 @@ WORKINGDIR=${BUILDROOT}

 BUILDROOT=${BUILDROOT}/photon-chroot

 cp -r BUILD_DVD/isolinux ${WORKINGDIR}/

+cp BUILD_DVD/isolinux/splash.png ${BUILDROOT}/installer/boot/.

 if [ "$LIVE_CD" = true ] ; then

     mv ${WORKINGDIR}/isolinux/live-menu.cfg ${WORKINGDIR}/isolinux/menu.cfg

@@ -163,6 +164,33 @@ if [ "$LIVE_CD" = false ] ; then

     #Remove the include files.

     rm -rf ${BUILDROOT}/usr/include

+    rm ${BUILDROOT}/lib64/libmvec*

+    rm ${BUILDROOT}/usr/sbin/grub2-bios-setup

+    rm ${BUILDROOT}/usr/sbin/grub2-probe

+    rm ${BUILDROOT}/usr/sbin/grub2-macbless

+    rm ${BUILDROOT}/usr/sbin/grub2-reboot   

+    rm ${BUILDROOT}/usr/sbin/grub2-sparc64-setup

+    rm ${BUILDROOT}/usr/sbin/sln

+    

+    rm ${BUILDROOT}/usr/bin/grub2-mkrescue

+    rm ${BUILDROOT}/usr/bin/grub2-fstest

+    rm ${BUILDROOT}/usr/bin/grub2-syslinux2cfg

+    rm ${BUILDROOT}/usr/bin/grub2-mkstandalone

+

+    rm ${BUILDROOT}/usr/bin/localedef

+    rm ${BUILDROOT}/usr/bin/systemd-nspawn

+    rm ${BUILDROOT}/usr/bin/systemd-analyze

+    rm -rf ${BUILDROOT}/usr/lib64/gconv

+

+    rm -rf ${BUILDROOT}/usr/lib/python2.7/lib2to3

+    rm -rf ${BUILDROOT}/usr/lib/python2.7/lib-tk

+    rm -rf ${BUILDROOT}/usr/lib/python2.7/ensurepip

+    rm -rf ${BUILDROOT}/usr/lib/python2.7/encoding

+    rm -rf ${BUILDROOT}/usr/lib/python2.7/distutils

+    rm -rf ${BUILDROOT}/usr/lib/python2.7/pydoc_data

+    rm -rf ${BUILDROOT}/usr/lib/python2.7/idlelib

+    rm -rf ${BUILDROOT}/usr/lib/python2.7/unittest 

+

     # 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

@@ -37,6 +37,11 @@ cd ${BUILDROOT} || fail "${PRGNAME}: Change directory: ${BUILDROOT}: FAILURE"

 #

 if [[	$# -gt 0 ]] && [[ $1 == 'install' ]]; then

 	mkdir -p ${BUILDROOT}/var/lib/rpm

+	mkdir -p ${BUILDROOT}/cache/tdnf

+	#Setup the disk

+	dd if=/dev/zero of=${BUILDROOT}/cache/swapfile bs=1M count=64

+    mkswap -v1 ${BUILDROOT}/cache/swapfile

+    swapon ${BUILDROOT}/cache/swapfile

 	rpm   --root ${BUILDROOT} --initdb

     tdnf install filesystem --installroot ${BUILDROOT} --nogpgcheck --assumeyes

 else

@@ -85,7 +85,7 @@ fi

 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

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

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

 cp boot/theme.txt ${BUILDROOT}/boot/grub2/themes/photon/

 cat > $BUILDROOT/boot/grub2/grub.cfg << EOF

@@ -111,6 +111,7 @@ loadfont "$BOOT_DIRECTORY"grub2/unifont.pf2

 insmod gfxterm

 insmod vbe

 insmod tga

+insmod png

 insmod ext2

 insmod part_gpt

@@ -94,16 +94,6 @@ class OstreeInstaller(Installer):

         self.progress_bar.initialize("Initializing installation...")

         self.progress_bar.show()

-        self.progress_bar.show_loading("Unpacking local OSTree repo")

-        

-        if self.default_repo:

-            self.run("mkdir repo")

-            self.run("tar --warning=none -xf /mnt/cdrom/ostree-repo.tar.gz -C repo")

-            self.local_repo_path = "/installer/repo/"

-            self.ostree_repo_url = self.repo_config['OSTREEREPOURL']

-            self.ostree_ref = self.repo_config['OSTREEREFS']

-

-

         self.execute_modules(modules.commons.PRE_INSTALL)

         disk = self.install_config['disk']['disk']

@@ -115,8 +105,30 @@ class OstreeInstaller(Installer):

         self.run("mkdir -p {} ".format(sysroot_boot))

         self.run("mount {}2 {}".format(disk, sysroot_boot))

+        self.progress_bar.show_loading("Unpacking local OSTree repo")

+

+        #Setup the disk

+        self.run("dd if=/dev/zero of={}/swapfile bs=1M count=64".format(self.photon_root))

+        self.run("mkswap -v1 {}/swapfile".format(self.photon_root))

+        self.run("swapon {}/swapfile".format(self.photon_root))

+

+        if self.default_repo:

+            self.run("rm -rf /installer/boot")

+            self.run("mkdir -p {}/repo".format(self.photon_root))

+            self.run("tar --warning=none -xf /mnt/cdrom/ostree-repo.tar.gz -C {}/repo".format(self.photon_root))

+            self.local_repo_path = "{}/repo".format(self.photon_root)

+            self.ostree_repo_url = self.repo_config['OSTREEREPOURL']

+            self.ostree_ref = self.repo_config['OSTREEREFS']

+

+

+        self.progress_bar.update_loading_message("Unpacking done")

+

+

         self.deploy_ostree(self.ostree_repo_url, self.ostree_ref)

+        self.run("swapoff -a")

+        self.run("rm {}/swapfile".format(self.photon_root))

+

         commit_number = self.get_commit_number(self.ostree_ref)

         self.do_systemd_tmpfiles_commands(commit_number)

@@ -18,7 +18,6 @@ import sys

 import glob

 import urllib

 import modules.commons

-import xml.etree.ElementTree as ET

 from jsonwrapper import JsonWrapper

 from progressbar import ProgressBar

 from windowstringreader import WindowStringReader