@@ -328,7 +328,7 @@ DISTRIB_DESCRIPTION="VMware Photon 1.0 TP2"

 EOF

 cat > %{buildroot}/usr/lib/os-release <<- "EOF"

-NAME=VMware Photon

+NAME="VMware Photon"

 VERSION="1.0 TP2"

 ID=photon

 VERSION_ID=1.0

@@ -93,7 +93,7 @@ cp -r Documentation/*        %{buildroot}%{_defaultdocdir}/linux-esx-%{version}

 # TODO: noacpi acpi=off noapic pci=conf1,nodomains pcie_acpm=off pnpacpi=off

 cat > %{buildroot}/boot/%{name}-%{version}-%{release}.cfg << "EOF"

 # GRUB Environment Block

-photon_cmdline=init=/lib/systemd/systemd tsc=reliable no_timer_check rcupdate.rcu_expedited=1 rootfstype=ext4 rw systemd.show_status=0 elevator=noop quiet nordrand noreplace-smp cpu_init_udelay=0

+photon_cmdline=init=/lib/systemd/systemd tsc=reliable no_timer_check rcupdate.rcu_expedited=1 rootfstype=ext4 rw systemd.show_status=0 elevator=noop quiet nordrand noreplace-smp cpu_init_udelay=0  plymouth.enable=0

 photon_linux=/boot/vmlinuz-esx-%{version}

 EOF

@@ -90,7 +90,7 @@ cp -v .config            %{buildroot}/boot/config-%{version}

 cp -r Documentation/*        %{buildroot}%{_defaultdocdir}/%{name}-%{version}

 cat > %{buildroot}/boot/%{name}-%{version}-%{release}.cfg << "EOF"

 # GRUB Environment Block

-photon_cmdline=init=/lib/systemd/systemd rootfstype=ext4 ro loglevel=3 quiet

+photon_cmdline=init=/lib/systemd/systemd rootfstype=ext4 ro loglevel=3 quiet plymouth.enable=0

 photon_linux=/boot/vmlinuz-%{version}

 photon_initrd=/boot/initrd.img-no-kmods

 EOF

new file mode 100644

@@ -0,0 +1,13 @@

+[Unit]

+Description=LVM2 activate volume groups

+After=systemd-udevd.service

+Before=local-fs-pre.target

+DefaultDependencies=no

+

+[Service]

+Type=oneshot

+ExecStart=/usr/sbin/lvm vgchange -ay

+RemainAfterExit=yes

+

+[Install]

+WantedBy=local-fs.target

@@ -1,7 +1,7 @@

 Summary:	Userland logical volume management tools 

 Name:		lvm2

 Version:	2.02.116

-Release:	1%{?dist}

+Release:	2%{?dist}

 License:	GPLv2

 Group:		System Environment/Base

 URL:		http://sources.redhat.com/dm

@@ -9,6 +9,7 @@ Vendor:		VMware, Inc.

 Distribution:	Photon

 Source0:	ftp://sources.redhat.com/pub/lvm2/releases/LVM2.%{version}.tgz

 %define sha1 LVM2=5bd2f4c33cdf93e580ea5b8a64bc32cd77be078e

+Source1:	lvm2-activate.service

 Patch0:		lvm2-set-default-preferred_names.patch

 Patch1:		lvm2-enable-lvmetad-by-default.patch

 Patch2:		lvm2-remove-mpath-device-handling-from-udev-rules.patch

@@ -21,6 +22,7 @@ BuildRequires:	systemd

 BuildRequires:	thin-provisioning-tools

 Requires:	device-mapper-libs = %{version}-%{release}

 Requires:	device-mapper-event-libs = %{version}-%{release}

+Requires:	device-mapper = %{version}-%{release}

 %description

 LVM2 includes all of the support for handling read/write operations on

@@ -183,9 +185,16 @@ make %{?_smp_mflags}

 %install

 make install DESTDIR=%{buildroot}

-

+make install_system_dirs DESTDIR=%{buildroot}

+make install_systemd_units DESTDIR=%{buildroot}

+make install_systemd_generators DESTDIR=%{buildroot}

+make install_tmpfiles_configuration DESTDIR=%{buildroot}

+cp %{SOURCE1} %{buildroot}/lib/systemd/system/lvm2-activate.service

 %post

 /sbin/ldconfig

+systemctl enable lvm2-lvmetad.service

+systemctl enable lvm2-monitor.service

+systemctl enable lvm2-activate.service

 %postun

 /sbin/ldconfig

@@ -240,6 +249,8 @@ make install DESTDIR=%{buildroot}

 %defattr(-,root,root,-)

 %attr(555, -, -) %{_sbindir}/dmeventd

 %{_mandir}/man8/dmeventd.8.gz

+/lib/systemd/system/dm-event.service

+/lib/systemd/system/dm-event.socket

 %files -n device-mapper-event-libs

 %defattr(555,root,root,-)

@@ -358,7 +369,18 @@ make install DESTDIR=%{buildroot}

 /usr/share/man/man8/vgs.8.gz

 /usr/share/man/man8/vgscan.8.gz

 /usr/share/man/man8/vgsplit.8.gz

+/lib/systemd/system-generators/lvm2-activation-generator

+/lib/systemd/system/blk-availability.service

+/lib/systemd/system/lvm2-lvmetad.service

+/lib/systemd/system/lvm2-lvmetad.socket

+/lib/systemd/system/lvm2-monitor.service

+/lib/systemd/system/lvm2-activate.service

+/lib/systemd/system/lvm2-pvscan@.service

+/usr/lib/tmpfiles.d/lvm2.conf

+/usr/share/man/man8/lvm2-activation-generator.8.gz

 %changelog

+* Thu Sep 10 2015 Divya Thaluru <dthaluru@vmware.com> 2.02.116-2

+- Packaging systemd service and configuration files

 * Thu Feb 26 2015 Divya Thaluru <dthaluru@vmware.com> 2.02.116-1

 - Initial version

@@ -1,7 +1,7 @@

 Summary:	Systemd-216

 Name:		systemd

 Version:	216

-Release:	10%{?dist}

+Release:	11%{?dist}

 License:	LGPLv2+ and GPLv2+ and MIT

 URL:		http://www.freedesktop.org/wiki/Software/systemd/

 Group:		System Environment/Security

@@ -72,6 +72,7 @@ for tool in runlevel reboot shutdown poweroff halt telinit; do

 done

 ln -sfv ../lib/systemd/systemd %{buildroot}/sbin/init

 rm -f %{buildroot}%{_var}/log/README

+mkdir -p %{buildroot}%{_localstatedir}/log/journal

 #cp %{buildroot}/usr/share/factory/etc/pam.d/system-auth %{buildroot}%{_sysconfdir}/pam.d/system-auth

 #cp %{buildroot}/usr/share/factory/etc/pam.d/other %{buildroot}%{_sysconfdir}/pam.d/other

@@ -92,9 +93,12 @@ rm -rf %{buildroot}/*

 /sbin/*

 %{_includedir}/*

 %{_datadir}/*

+%dir %{_localstatedir}/log/journal

 %changelog

+*	Fri Sep 18 2015 Divya Thaluru <dthaluru@vmware.com> 216-11

+-	Packaging journal log directory

 *	Tue Sep 10 2015 Alexey Makhalov <amakhalov@vmware.com> 216-10

 -	Improve enoX renaming in VMware HV case. Patch is added.

 *	Tue Aug 25 2015 Alexey Makhalov <amakhalov@vmware.com> 216-9

new file mode 100644

@@ -0,0 +1,7 @@

+{

+    "dracut_configuration" : {

+        "add_drivers" : ["tmem","xen-acpi-processor","xen-evtchn","xen-gntalloc","xen-gntdev","xen-privcmd","xen-pciback","xenfs",

+				"hv_ballon","hv_utils","hv_vmbus","cn"

+			]

+    }

+}

@@ -23,6 +23,7 @@ from jsonwrapper import JsonWrapper

 from progressbar import ProgressBar

 from window import Window

 from actionresult import ActionResult

+from __builtin__ import isinstance

 class Installer(object):

     def __init__(self, install_config, maxy = 0, maxx = 0, iso_installer = False, rpm_path = "../stage/RPMS", log_path = "../stage/LOGS", ks_config = None):

@@ -298,9 +299,27 @@ class Installer(object):

             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)

+            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)

             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)

+        

     def install_package(self,  package_name):

         rpm_params = ''

@@ -353,4 +372,4 @@ class Installer(object):

         modules.commons.log(modules.commons.LOG_INFO, "Installer: {} ".format(command))

         process = subprocess.Popen([command], shell=True, stdout=self.output)

         retval = process.wait()

-        return retval

\ No newline at end of file

+        return retval

@@ -128,6 +128,7 @@ 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")

     (options,  args) = parser.parse_args()

     if options.iso_path:

@@ -190,6 +191,12 @@ if __name__ == '__main__':

     config['packages'] = packages

+    if config['iso_system'] == True:

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

+

     # Cleanup the working directory

     if not options.force:

         proceed = query_yes_no("This will remove everything under {0}. Are you sure?".format(options.working_directory))