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

 Summary:	NetworkManager

 Name:		NetworkManager

 Version:	1.0.2

-Release:	4%{?dist}

+Release:	2%{?dist}

 License:	LGPLv2+

 URL:		https://download.gnome.org/sources/NetworkManager/1.0/NetworkManager-1.0.2.tar.xz

 Source0:	https://download.gnome.org/sources/NetworkManager/1.0/%{name}-%{version}.tar.xz

@@ -22,29 +22,10 @@ BuildRequires:	python2

 BuildRequires:	python2-libs

 BuildRequires:	dhcp-client

 BuildRequires:	libsoup-devel

-BuildRequires:	libgudev >= 165

-BuildRequires:	libgudev-devel >= 165

-

-Requires:	dbus-glib

-Requires:	libnl

-Requires:	readline

-Requires:	ncurses

-Requires:	nss

-Requires:	libndp

-Requires:	libsoup

-Requires:	libgudev >= 165

 %package devel

 Summary:	Libraries and header files for NetworkManager

 Requires:	NetworkManager

-Requires:	dbus-glib-devel

-Requires:	libnl-devel

-Requires:	readline-devel

-Requires:	ncurses-devel

-Requires:	nss-devel

-Requires:	libndp-devel

-Requires:	libsoup-devel

-Requires:	libgudev-devel >= 165

 %description devel

 Headers and libraries for the NetworkManager.

@@ -104,10 +85,6 @@ EOF

 %{_libdir}/*.so

 %{_libdir}/pkgconfig/*.pc

 %changelog

-*	Thu Aug 13 2015 Vinay Kulkarni <kulkarniv@vmware.com> 1.0.2-4

--	Update libgudev devel dependency, requires.

-*	Wed Aug 12 2015 Vinay Kulkarni <kulkarniv@vmware.com> 1.0.2-3

--	Add libgudev dependency.

 *	Thu Jul 23 2015 Divya Thaluru <dthaluru@vmware.com> 1.0.2-2

 -	Building with dhclient.

 *	Tue Jun 23 2015 Divya Thaluru <dthaluru@vmware.com> 1.0.2-1

@@ -84,6 +84,7 @@ make %{?_smp_mflags}

 make install DESTDIR=%{buildroot} INSTALL="install -p -c"

 find %{buildroot} -name '*.la' -delete

 install -D -m 0644 %{SOURCE1} %{buildroot}%{_prefix}/lib/systemd/system-preset/91-ostree.preset

+install -vdm 755 %{buildroot}/etc/ostree/remotes.d

 mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/

 cp -R %{buildroot}/lib/systemd/system/*.service %{buildroot}%{_prefix}/lib/systemd/system/

 rm -rf %{buildroot}/lib

@@ -110,6 +111,7 @@ rm -rf %{buildroot}

 %{_sysconfdir}/grub.d/*ostree

 %{_sysconfdir}/dracut.conf.d/ostree.conf

 %{_sysconfdir}/ostree-mkinitcpio.conf

+%dir %{_sysconfdir}/ostree/remotes.d

 %{_libdir}/girepository-*/OSTree-*.typelib

 %{_libexecdir}/ostree/grub2*

 %{_libdir}/initcpio/*

new file mode 100644

@@ -0,0 +1,191 @@

+Submitted By:            Armin K. <krejzi at email dot com>

+Date:                    2014-08-20

+Initial Package Version: 211

+Upstream Status:         Not applicable

+Origin:                  Self

+Description:             Make it install compat pkg-config files without

+                         building compat-libs which are useless on LFS.

+

+--- a/Makefile.am	2014-08-19 22:45:13.105608241 +0200

+@@ -2556,7 +2556,11 @@

+ UNINSTALL_EXEC_HOOKS += libsystemd-uninstall-hook

+ 

+ pkgconfiglib_DATA += \

+-	src/libsystemd/libsystemd.pc

++	src/libsystemd/libsystemd.pc \

++	src/compat-libs/libsystemd-journal.pc \

++	src/compat-libs/libsystemd-login.pc \

++	src/compat-libs/libsystemd-id128.pc \

++	src/compat-libs/libsystemd-daemon.pc

+ 

+ pkginclude_HEADERS += \

+ 	src/systemd/sd-login.h \

+@@ -5551,12 +5555,6 @@

+ 	libsystemd-id128.la \

+ 	libsystemd-daemon.la

+ 

+-pkgconfiglib_DATA += \

+-	src/compat-libs/libsystemd-journal.pc \

+-	src/compat-libs/libsystemd-login.pc \

+-	src/compat-libs/libsystemd-id128.pc \

+-	src/compat-libs/libsystemd-daemon.pc

+-

+ # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed

+ compat-lib-install-hook:

+ 	libname=libsystemd-login.so && $(move-to-rootlibdir)

+--- a/Makefile.in	2014-08-19 23:25:16.844861060 +0200

+@@ -1310,21 +1310,18 @@

+ @ENABLE_COMPAT_LIBS_TRUE@	libsystemd-id128.la \

+ @ENABLE_COMPAT_LIBS_TRUE@	libsystemd-daemon.la

+ 

+-@ENABLE_COMPAT_LIBS_TRUE@am__append_294 = \

+-@ENABLE_COMPAT_LIBS_TRUE@	src/compat-libs/libsystemd-journal.pc \

+-@ENABLE_COMPAT_LIBS_TRUE@	src/compat-libs/libsystemd-login.pc \

+-@ENABLE_COMPAT_LIBS_TRUE@	src/compat-libs/libsystemd-id128.pc \

+-@ENABLE_COMPAT_LIBS_TRUE@	src/compat-libs/libsystemd-daemon.pc

+-

+-@ENABLE_COMPAT_LIBS_TRUE@am__append_295 = compat-lib-install-hook

+-@ENABLE_COMPAT_LIBS_TRUE@am__append_296 = compat-lib-uninstall-hook

+-@ENABLE_MANPAGES_TRUE@am__append_297 = \

++@ENABLE_COMPAT_LIBS_TRUE@am__append_294 = compat-lib-install-hook

++@ENABLE_COMPAT_LIBS_TRUE@am__append_295 = compat-lib-uninstall-hook

++@ENABLE_MANPAGES_TRUE@am__append_296 = \

+ @ENABLE_MANPAGES_TRUE@	man/custom-entities.ent

+ 

+-@HAVE_SYSV_COMPAT_TRUE@am__append_298 = \

++@HAVE_SYSV_COMPAT_TRUE@am__append_297 = \

+ @HAVE_SYSV_COMPAT_TRUE@	docs/sysvinit/README \

+ @HAVE_SYSV_COMPAT_TRUE@	docs/var-log/README

+ 

++@HAVE_SYSV_COMPAT_TRUE@am__append_298 = \

++@HAVE_SYSV_COMPAT_TRUE@	systemd-update-utmp-runlevel.service

++

+ @HAVE_SYSV_COMPAT_TRUE@am__append_299 = \

+ @HAVE_SYSV_COMPAT_TRUE@	systemd-update-utmp-runlevel.service

+ 

+@@ -1338,9 +1335,6 @@

+ @HAVE_SYSV_COMPAT_TRUE@	systemd-update-utmp-runlevel.service

+ 

+ @HAVE_SYSV_COMPAT_TRUE@am__append_303 = \

+-@HAVE_SYSV_COMPAT_TRUE@	systemd-update-utmp-runlevel.service

+-

+-@HAVE_SYSV_COMPAT_TRUE@am__append_304 = \

+ @HAVE_SYSV_COMPAT_TRUE@	poweroff.target runlevel0.target \

+ @HAVE_SYSV_COMPAT_TRUE@	rescue.target runlevel1.target \

+ @HAVE_SYSV_COMPAT_TRUE@	multi-user.target runlevel2.target \

+@@ -1349,25 +1343,25 @@

+ @HAVE_SYSV_COMPAT_TRUE@	graphical.target runlevel5.target \

+ @HAVE_SYSV_COMPAT_TRUE@	reboot.target runlevel6.target

+ 

+-@HAVE_SYSV_COMPAT_TRUE@am__append_305 = \

++@HAVE_SYSV_COMPAT_TRUE@am__append_304 = \

+ @HAVE_SYSV_COMPAT_TRUE@	$(systemunitdir)/runlevel1.target.wants \

+ @HAVE_SYSV_COMPAT_TRUE@	$(systemunitdir)/runlevel2.target.wants \

+ @HAVE_SYSV_COMPAT_TRUE@	$(systemunitdir)/runlevel3.target.wants \

+ @HAVE_SYSV_COMPAT_TRUE@	$(systemunitdir)/runlevel4.target.wants \

+ @HAVE_SYSV_COMPAT_TRUE@	$(systemunitdir)/runlevel5.target.wants

+ 

+-@HAVE_SYSV_COMPAT_TRUE@am__append_306 = \

++@HAVE_SYSV_COMPAT_TRUE@am__append_305 = \

+ @HAVE_SYSV_COMPAT_TRUE@	--with-sysvinit-path=$$dc_install_base/$(sysvinitdir) \

+ @HAVE_SYSV_COMPAT_TRUE@	--with-sysvrcnd-path=$$dc_install_base/$(sysvrcnddir)

+ 

+-@HAVE_SYSV_COMPAT_FALSE@am__append_307 = \

++@HAVE_SYSV_COMPAT_FALSE@am__append_306 = \

+ @HAVE_SYSV_COMPAT_FALSE@	--with-sysvinit-path= \

+ @HAVE_SYSV_COMPAT_FALSE@	--with-sysvrcnd-path=

+ 

+-@HAVE_PYTHON_TRUE@am__append_308 = \

++@HAVE_PYTHON_TRUE@am__append_307 = \

+ @HAVE_PYTHON_TRUE@	--with-python

+ 

+-@ENABLE_GTK_DOC_TRUE@am__append_309 = \

++@ENABLE_GTK_DOC_TRUE@am__append_308 = \

+ @ENABLE_GTK_DOC_TRUE@	--enable-gtk-doc

+ 

+ subdir = .

+@@ -4901,8 +4895,8 @@

+ 	$(am__append_266) $(am__append_289) $(nodist_systemunit_DATA) \

+ 	$(nodist_userunit_DATA) $(pkgconfigdata_DATA) \

+ 	$(pkgconfiglib_DATA) $(nodist_polkitpolicy_DATA) \

+-	$(am__append_298) defined undefined

+-DISTCLEANFILES = $(am__append_297)

++	$(am__append_297) defined undefined

++DISTCLEANFILES = $(am__append_296)

+ 

+ # Really, do not edit this file.

+ EXTRA_DIST = shell-completion/bash/systemctl.in \

+@@ -5124,10 +5118,10 @@

+ 	install-touch-usr-hook systemd-detect-virt-install-hook \

+ 	$(am__append_95) bus-proxyd-install-hook \

+ 	libsystemd-install-hook libudev-install-hook $(am__append_126) \

+-	journal-install-hook $(am__append_295)

++	journal-install-hook $(am__append_294)

+ UNINSTALL_EXEC_HOOKS = $(am__append_96) bus-proxyd-uninstall-hook \

+ 	libsystemd-uninstall-hook libudev-uninstall-hook \

+-	journal-uninstall-hook $(am__append_296)

++	journal-uninstall-hook $(am__append_295)

+ INSTALL_DATA_HOOKS = units-install-hook hwdb-update-hook \

+ 	catalog-update-hook

+ UNINSTALL_DATA_HOOKS = units-uninstall-hook catalog-remove-hook

+@@ -5167,7 +5161,11 @@

+ include_HEADERS = src/libudev/libudev.h

+ noinst_DATA = $(am__append_53) $(am__append_55) $(am__append_106)

+ pkgconfiglib_DATA = src/libsystemd/libsystemd.pc \

+-	src/libudev/libudev.pc $(am__append_117) $(am__append_294)

++	src/compat-libs/libsystemd-journal.pc \

++	src/compat-libs/libsystemd-login.pc \

++	src/compat-libs/libsystemd-id128.pc \

++	src/compat-libs/libsystemd-daemon.pc src/libudev/libudev.pc \

++	$(am__append_117)

+ polkitpolicy_in_in_files =  \

+ 	src/core/org.freedesktop.systemd1.policy.in.in

+ polkitpolicy_in_files =  \

+@@ -5302,7 +5300,7 @@

+ # ------------------------------------------------------------------------------

+ INSTALL_DIRS = $(am__append_78) $(am__append_84) \

+ 	$(sysconfdir)/udev/rules.d $(sysconfdir)/udev/hwdb.d \

+-	$(am__append_164) $(am__append_282) $(am__append_305) \

++	$(am__append_164) $(am__append_282) $(am__append_304) \

+ 	$(prefix)/lib/modules-load.d $(sysconfdir)/modules-load.d \

+ 	$(prefix)/lib/systemd/network $(sysconfdir)/systemd/network \

+ 	$(prefix)/lib/sysctl.d $(sysconfdir)/sysctl.d \

+@@ -5313,11 +5311,11 @@

+ 	$(pkgsysconfdir)/system/getty.target.wants \

+ 	$(pkgsysconfdir)/user $(dbussessionservicedir) \

+ 	$(sysconfdir)/xdg/systemd

+-RUNLEVEL1_TARGET_WANTS = $(am__append_299)

+-RUNLEVEL2_TARGET_WANTS = $(am__append_300)

+-RUNLEVEL3_TARGET_WANTS = $(am__append_301)

+-RUNLEVEL4_TARGET_WANTS = $(am__append_302)

+-RUNLEVEL5_TARGET_WANTS = $(am__append_303)

++RUNLEVEL1_TARGET_WANTS = $(am__append_298)

++RUNLEVEL2_TARGET_WANTS = $(am__append_299)

++RUNLEVEL3_TARGET_WANTS = $(am__append_300)

++RUNLEVEL4_TARGET_WANTS = $(am__append_301)

++RUNLEVEL5_TARGET_WANTS = $(am__append_302)

+ SHUTDOWN_TARGET_WANTS = 

+ LOCAL_FS_TARGET_WANTS = systemd-remount-fs.service tmp.mount

+ MULTI_USER_TARGET_WANTS = $(am__append_283) getty.target \

+@@ -5345,7 +5343,7 @@

+ USER_BUSNAMES_TARGET_WANTS = 

+ SYSTEM_UNIT_ALIASES = $(am__append_195) $(am__append_208) \

+ 	$(am__append_220) $(am__append_242) $(am__append_253) \

+-	$(am__append_284) $(am__append_304) graphical.target \

++	$(am__append_284) $(am__append_303) graphical.target \

+ 	default.target reboot.target ctrl-alt-del.target \

+ 	getty@.service autovt@.service

+ USER_UNIT_ALIASES = $(systemunitdir)/shutdown.target shutdown.target \

+@@ -8769,8 +8767,8 @@

+ 	--with-pamlibdir=$$dc_install_base/$(pamlibdir) \

+ 	--with-pamconfdir=$$dc_install_base/$(pamconfdir) \

+ 	--with-rootprefix=$$dc_install_base --disable-split-usr \

+-	--enable-kdbus --enable-compat-libs $(am__append_306) \

+-	$(am__append_307) $(am__append_308) $(am__append_309)

++	--enable-kdbus --enable-compat-libs $(am__append_305) \

++	$(am__append_306) $(am__append_307) $(am__append_308)

+ www_target = www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd

+ OBJECT_VARIABLES := $(filter %_OBJECTS,$(.VARIABLES))

+ ALL_OBJECTS := $(foreach v,$(OBJECT_VARIABLES),$($(v)))

new file mode 100644

@@ -0,0 +1,45 @@

+diff -ru systemd-216/src/network/networkd-manager.c systemd-216-4/src/network/networkd-manager.c

+--- systemd-216/src/network/networkd-manager.c	2014-08-15 14:42:14.000000000 +0000

+@@ -35,6 +35,7 @@

+ #include "virt.h"

+ 

+ #include "sd-rtnl.h"

++#define UDEV_INIT_LOOP_WAIT_COUNT 10000

+ 

+ const char* const network_dirs[] = {

+         "/etc/systemd/network",

+@@ -225,7 +226,9 @@

+         NetDev *netdev = NULL;

+         uint16_t type;

+         const char *name;

+-        int r, ifindex;

++        int r, ifindex, i;

++        char ifindex_str[2 + DECIMAL_STR_MAX(int)];

++        struct udev_device *device = NULL;

+ 

+         assert(rtnl);

+         assert(message);

+@@ -244,6 +247,21 @@

+         } else

+                 link_get(m, ifindex, &link);

+ 

++        /* Networkd must wait for udev to finish device initiatization/ renaming the interface.

++        The maximum wait time is 10 second but it takes less than 1 second for udev to make it up in some udev/networkd race cases */

++

++        sprintf(ifindex_str, "n%d", ifindex);

++        device = udev_device_new_from_device_id(m->udev, ifindex_str);

++        

++        for(i=0 ; i < UDEV_INIT_LOOP_WAIT_COUNT ; i++) {

++                if (!udev_device_get_is_initialized(device)) {

++                        usleep(1);

++                        continue;

++                } else {

++                        break;

++                }   

++        } 

++

+         r = sd_rtnl_message_read_string(message, IFLA_IFNAME, &name);

+         if (r < 0 || !name) {

+                 log_warning("rtnl: received link message without valid ifname");

+Only in systemd-216-4/src/network: networkd-manager.c~

@@ -1,32 +1,30 @@

-Summary:	Systemd-221

+Summary:	Systemd-216

 Name:		systemd

-Version:	221

-Release:	1%{?dist}

+Version:	216

+Release:	8%{?dist}

 License:	LGPLv2+ and GPLv2+ and MIT

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

 Group:		System Environment/Security

 Vendor:		VMware, Inc.

 Distribution:	Photon

-Source0:	http://www.freedesktop.org/software/%{name}/%{name}-%{version}.tar.xz

-%define sha1 systemd-221=682ebb60305f4bf1067aca929d664d062e80888f

-Patch0:     	systemd-221-compat-1.patch

-Source1:	lfs-lsb-init-functions

-

-BuildRequires:	glib-devel

-BuildRequires:	gperf

+Source0:	http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz

+%define sha1 systemd=0d933a2f76db5d30f52429e9b172323bc6abd49a

+Patch0:     	systemd-216-compat-1.patch

+Patch1:         systemd-216-if-rename.patch

+Requires:	Linux-PAM

+Requires:	libcap

+Requires:	xz

 BuildRequires:	intltool

-BuildRequires:	kbd

-BuildRequires:	kmod

-BuildRequires:	Linux-PAM

+BuildRequires:	gperf

 BuildRequires:	libcap

-BuildRequires:	XML-Parser

 BuildRequires:	xz-devel

-Requires:	glib

+BuildRequires:	Linux-PAM

+BuildRequires:	XML-Parser

+BuildRequires:	kbd

+BuildRequires:	kmod

 Requires:	kmod

-Requires:	Linux-PAM

-Requires:	libcap

-Requires:	xz

-

+BuildRequires:	glib-devel

+Requires:	glib

 %description

 Systemd is an init replacement with better process control and security

@@ -41,21 +39,21 @@ cc_cv_CFLAGS__flto=no

 EOF

 sed -i "s:blkid/::" $(grep -rl "blkid/blkid.h")

 %patch0 -p1

-

+%patch1 -p1

 %build

-./configure --prefix=%{_prefix}                                     \

+./configure --prefix=%{_prefix}                                    \

             --sysconfdir=/etc                                       \

             --localstatedir=/var                                    \

             --config-cache                                          \

             --with-rootprefix=                                      \

-            --with-rootlibdir=/usr/lib                              \

+            --with-rootlibdir=/usr/lib                                  \

             --enable-split-usr                                      \

             --disable-firstboot                                     \

             --disable-ldconfig                                      \

             --disable-sysusers                                      \

             --without-python                                        \

             --enable-pam                                            \

-            --docdir=%{_prefix}/share/doc/systemd-221               \

+            --docdir=%{_prefix}/share/doc/systemd-216                     \

             --with-dbuspolicydir=/etc/dbus-1/system.d               \

             --with-dbusinterfacedir=%{_prefix}/share/dbus-1/interfaces    \

             --with-dbussessionservicedir=%{_prefix}/share/dbus-1/services \

@@ -65,7 +63,6 @@ sed -i "s:blkid/::" $(grep -rl "blkid/blkid.h")

 	    --with-rc-local-script-path-start=/etc/rc.d/rc.local

 make %{?_smp_mflags}

-

 %install

 [ %{buildroot} != "/"] && rm -rf %{buildroot}/*

 make DESTDIR=%{buildroot} install

@@ -75,19 +72,15 @@ 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

-install -vDm 0755 %{SOURCE1} %{buildroot}%{_libdir}/lsb/init-functions

 #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

 %post	-p /sbin/ldconfig

-

 %postun	

 /sbin/ldconfig

-

 %clean

 rm -rf %{buildroot}/*

-

 %files

 %defattr(-,root,root)

 %{_sysconfdir}/*

@@ -102,9 +95,7 @@ rm -rf %{buildroot}/*

 %changelog

-*	Mon Aug 10 2015 Vinay Kulkarni <kulkarniv@vmware.com> 221-1

--	Update systemd to v221

-*	Mon Jul 20 2015 Divya Thaluru <dthaluru@vmware.com> 216-8

+*	Tue Jul 20 2015 Divya Thaluru <dthaluru@vmware.com> 216-8

 -	Adding sysvinit support 

 *       Mon Jul 06 2015 Kumar Kaushik <kaushikk@vmware.com> 216-7

 -       Fixing networkd/udev race condition for renaming interface.

new file mode 100644

@@ -0,0 +1,2 @@

+OSTREEREPOURL=https://dl.bintray.com/vmware/photon/rpm-ostree/dev/x86_64/minimal

+OSTREEREFS=tp2/x86_64/minimal

@@ -26,16 +26,34 @@ class OstreeInstaller(Installer):

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

         Installer.__init__(self, install_config, maxy, maxx, iso_installer, rpm_path, log_path, ks_config)

+        self.repo_config = {}

+        self.repo_read_conf()

     def get_ostree_repo_url(self):

         self.default_repo = 'default_repo' in self.install_config and self.install_config['default_repo'];

-        self.ostree_repo_url = self.install_config['ostree_repo_url']

-        self.ostree_ref = self.install_config['ostree_repo_ref']

+        if not self.default_repo:

+            self.ostree_repo_url = self.install_config['ostree_repo_url']

+            self.ostree_ref = self.install_config['ostree_repo_ref']

+

+    def repo_read_conf(self):

+        with open("ostree-release-repo.conf") as repo_conf:

+            for line in repo_conf:

+                name, value = line.partition("=")[::2]

+                self.repo_config[name] = value.strip(' \n\t\r')

+

+    def pull_repo(self, repo_url, repo_ref):

+        if self.default_repo:

+            self.run("ostree remote add --repo={}/ostree/repo --set=gpg-verify=false photon {}".format(self.photon_root, repo_url), "Adding OSTree remote")

+            self.run("ostree pull-local --repo={}/ostree/repo {}".format(self.photon_root, self.local_repo_path), "Pulling OSTree remote repo")

+            self.run("mv {}/ostree/repo/refs/heads {}/ostree/repo/refs/remotes/photon".format(self.photon_root, self.photon_root))

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

+        else:

+            self.run("ostree remote add --repo={}/ostree/repo --set=gpg-verify=false photon {}".format(self.photon_root, repo_url), "Adding OSTree remote")

+            self.run("ostree pull --repo={}/ostree/repo photon {}".format(self.photon_root, repo_ref), "Pulling OSTree remote repo")

     def deploy_ostree(self, repo_url, repo_ref):

         self.run("ostree admin --sysroot={} init-fs {}".format(self.photon_root, self.photon_root), "Initializing OSTree filesystem")

-        self.run("ostree remote add --repo={}/ostree/repo --set=gpg-verify=false photon {}".format(self.photon_root, repo_url), "Adding OSTree remote")

-        self.run("ostree pull --repo={}/ostree/repo photon {}".format(self.photon_root, repo_ref), "Pulling OSTree remote repo")

+        self.pull_repo(repo_url, repo_ref)

         self.run("ostree admin --sysroot={} os-init photon ".format(self.photon_root), "OSTree OS Initializing")

         self.run("ostree admin --sysroot={} deploy --os=photon photon/{}".format(self.photon_root, repo_ref), "Deploying")

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

         self.window.show_window()

         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)

@@ -132,14 +160,9 @@ class OstreeInstaller(Installer):

         self.run("mount --bind {} {}".format(deployment, self.photon_root))

         self.progress_bar.show_loading("Starting post install modules")

         self.execute_modules(modules.commons.POST_INSTALL)

-

+        self.progress_bar.show_loading("Unmounting disks")

         self.run("{} {} {}".format(self.unmount_disk_command, '-w', self.photon_root))

-

+        self.progress_bar.show_loading("Ready to restart")

         self.progress_bar.hide()

-        self.window.addstr(0, 0,

-            "Congratulations, Photon has been installed in {} secs.\n\nPress any key to continue to boot...".format(self.progress_bar.time_elapsed))

-        if self.ks_config == None:

-            self.window.content_window().getch()

-

         return ActionResult(True, None)

@@ -21,7 +21,7 @@

                 "sed", "grep", "cpio", "gzip",

                 "openssl", "ca-certificates", "curl",

                 "systemd",

-                "openssh",

+                "openssh", "iptables",

                 "photon-release",

                 "vim", "tdnf",

                 "docker","bridge-utils",