new file mode 100644

@@ -0,0 +1,77 @@

+diff --git a/src/core/mount.c b/src/core/mount.c

+index 9b44357..2ad4ad4 100644

+--- a/src/core/mount.c

+@@ -335,7 +335,7 @@ static int mount_add_device_links(Mount *m) {

+         if (mount_is_auto(p) && UNIT(m)->manager->running_as == MANAGER_SYSTEM)

+                 device_wants_mount = true;

+ 

+-        r = unit_add_node_link(UNIT(m), p->what, device_wants_mount);

++        r = unit_add_node_link(UNIT(m), p->what, device_wants_mount, m->from_fragment ? UNIT_BINDS_TO : UNIT_REQUIRES);

+         if (r < 0)

+                 return r;

+ 

+diff --git a/src/core/socket.c b/src/core/socket.c

+index 687675b..860a1e3 100644

+--- a/src/core/socket.c

+@@ -289,7 +289,7 @@ static int socket_add_device_link(Socket *s) {

+                 return 0;

+ 

+         t = strjoina("/sys/subsystem/net/devices/", s->bind_to_device);

+-        return unit_add_node_link(UNIT(s), t, false);

++        return unit_add_node_link(UNIT(s), t, false, UNIT_BINDS_TO);

+ }

+ 

+ static int socket_add_default_dependencies(Socket *s) {

+diff --git a/src/core/swap.c b/src/core/swap.c

+index b6e4372..5568898 100644

+--- a/src/core/swap.c

+@@ -202,7 +202,7 @@ static int swap_add_device_links(Swap *s) {

+                 return 0;

+ 

+         if (is_device_path(s->what))

+-                return unit_add_node_link(UNIT(s), s->what, UNIT(s)->manager->running_as == MANAGER_SYSTEM);

++                return unit_add_node_link(UNIT(s), s->what, UNIT(s)->manager->running_as == MANAGER_SYSTEM, UNIT_BINDS_TO);

+         else

+                 /* File based swap devices need to be ordered after

+                  * systemd-remount-fs.service, since they might need a

+diff --git a/src/core/unit.c b/src/core/unit.c

+index 0a02e38..e6e67d2 100644

+--- a/src/core/unit.c

+@@ -2840,7 +2840,7 @@ int unit_deserialize(Unit *u, FILE *f, FDSet *fds) {

+         }

+ }

+ 

+-int unit_add_node_link(Unit *u, const char *what, bool wants) {

++int unit_add_node_link(Unit *u, const char *what, bool wants, UnitDependency dep) {

+         Unit *device;

+         _cleanup_free_ char *e = NULL;

+         int r;

+@@ -2867,7 +2867,9 @@ int unit_add_node_link(Unit *u, const char *what, bool wants) {

+         if (r < 0)

+                 return r;

+ 

+-        r = unit_add_two_dependencies(u, UNIT_AFTER, u->manager->running_as == MANAGER_SYSTEM ? UNIT_BINDS_TO : UNIT_WANTS, device, true);

++        r = unit_add_two_dependencies(u, UNIT_AFTER,

++                                      u->manager->running_as == MANAGER_SYSTEM ? dep : UNIT_WANTS,

++                                      device, true);

+         if (r < 0)

+                 return r;

+ 

+diff --git a/src/core/unit.h b/src/core/unit.h

+index 1681bbf..3eb3484 100644

+--- a/src/core/unit.h

+@@ -528,7 +528,7 @@ int unit_serialize_item_escaped(Unit *u, FILE *f, const char *key, const char *v

+ int unit_serialize_item_fd(Unit *u, FILE *f, FDSet *fds, const char *key, int fd);

+ void unit_serialize_item_format(Unit *u, FILE *f, const char *key, const char *value, ...) _printf_(4,5);

+ 

+-int unit_add_node_link(Unit *u, const char *what, bool wants);

++int unit_add_node_link(Unit *u, const char *what, bool wants, UnitDependency d);

+ 

+ int unit_coldplug(Unit *u);

+ 

+

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

 Summary:	Systemd-228

 Name:		systemd

 Version:	228

-Release:	2%{?dist}

+Release:	3%{?dist}

 License:	LGPLv2+ and GPLv2+ and MIT

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

 Group:		System Environment/Security

@@ -9,10 +9,10 @@ Vendor:		VMware, Inc.

 Distribution:	Photon

 Source0:	%{name}-%{version}.tar.gz

 %define sha1 systemd=15475d874dc38f8d759f334bbcf7d8aff4b412da

+#patch for ostree

+Patch0:     	systemd-228-mount.patch

 Patch1:		01-enoX-uses-instance-number-for-vmware-hv.patch

 Patch2:		systemd-228-loopback-address.patch

-#patch for ostree

-#Patch0:     	systemd-mount.patch

 Requires:	Linux-PAM

 Requires:	libcap

 Requires:	xz

@@ -41,7 +41,7 @@ BLKID_CFLAGS="-I/usr/include/blkid"

 cc_cv_CFLAGS__flto=no

 EOF

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

-#%patch0 -p1

+%patch0 -p1

 %patch1 -p1

 %patch2 -p1

 %build

@@ -104,6 +104,8 @@ rm -rf %{buildroot}/*

 %changelog

+*   	Wed Dec 16 2015 Anish Swaminathan <anishs@vmware.com> 228-3

+-   	Patch for ostree.

 *   	Wed Dec 16 2015 Anish Swaminathan <anishs@vmware.com> 228-2

 -   	Patch for loopback address.

 *   	Fri Dec 11 2015 Anish Swaminathan <anishs@vmware.com> 228-1

@@ -107,7 +107,8 @@ class OstreeInstaller(Installer):

         self.execute_modules(modules.commons.PRE_INSTALL)

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

-        self.run("sgdisk -d 2 -n 2::+300M -n 3: -p {}".format(disk), "Updating partition table for OSTree")

+        self.run("sgdisk -d 1 -d 2 -n 1::+2M -n 2::+300M -n 3: -p {}".format(disk), "Updating partition table for OSTree")

+        self.run("sgdisk -t1:ef02 {}".format(disk))

         self.run("mkfs -t ext4 {}2".format(disk))

         self.run("mkfs -t ext4 {}3".format(disk))

         self.run("mount {}3 {}".format(disk, self.photon_root))

@@ -19,7 +19,7 @@

     "packages": ["glibc", "zlib", "binutils", "gmp", "mpfr", "libgcc", "libstdc++","libgomp",

                 "pkg-config", "ncurses", "bash", "bzip2", "cracklib", "cracklib-dicts", "shadow",

-                "procps-ng", "iana-etc", "readline", "coreutils", "bc", "libtool", "inetutils",

+                "procps-ng", "iana-etc", "readline", "coreutils", "bc", "libtool", "net-tools",

                 "findutils", "xz", "grub2", "iproute2", "util-linux", "linux",

                 "attr", "libcap", "kmod", "expat", "dbus", "file",

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