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

 Summary:	initramfs

 Name:		initramfs

 Version:	2.0

-Release:	3%{?dist}

+Release:	4%{?dist}

 Source0:	fscks.conf

 License:	Apache License

 Group:		System Environment/Base

@@ -19,7 +19,7 @@ install -D -m644 %{SOURCE0} %{buildroot}%{_sysconfdir}/dracut.conf.d/

 install -d -m755 %{buildroot}%{_localstatedir}/lib/initramfs/kernel

 %define watched_path %{_sbindir} %{_libdir}/udev/rules.d %{_libdir}/systemd/system /lib/modules %{_sysconfdir}/dracut.conf.d

-%define watched_pkgs e2fsprogs, ostree, systemd, kpartx, device-mapper-multipath

+%define watched_pkgs e2fsprogs, systemd, kpartx, device-mapper-multipath

 %define removal_action() rm -rf %{_localstatedir}/lib/rpm-state/initramfs

@@ -111,6 +111,8 @@ echo "initramfs" %{version}-%{release} "postun" >&2

 %dir %{_localstatedir}/lib/initramfs/kernel

 %changelog

+*   Mon Aug 27 2018 Dheeraj Shetty <dheerajs@vmware.com> 2.0-4

+-   Remove watching ostree

 *   Thu Jul 27 2017 Bo Gan <ganb@vmware.com> 2.0-3

 -   Move all states to one directory

 *   Fri May 26 2017 Bo Gan <ganb@vmware.com> 2.0-2

deleted file mode 100644

@@ -1,21 +0,0 @@

-+++ b/libhif/hif-self-test.c	2017-08-24 14:38:49.224151180 -0700

-@@ -1102,12 +1102,12 @@

- 	g_log_set_fatal_mask (NULL, G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL);

- 

- 	/* tests go here */

--	g_test_add_func ("/libhif/repos{gpg-asc}", hif_repos_gpg_asc_func);

--	g_test_add_func ("/libhif/repos{gpg-wrong-asc}", hif_repos_gpg_wrong_asc_func);

--	g_test_add_func ("/libhif/repos{gpg-no-asc}", hif_repos_gpg_no_asc_func);

--	g_test_add_func ("/libhif/repos", hif_repos_func);

--	g_test_add_func ("/libhif/repos{gpg-no-pubkey}", hif_repos_gpg_no_pubkey_func);

--	g_test_add_func ("/libhif/context", hif_context_func);

-+	//g_test_add_func ("/libhif/repos{gpg-asc}", hif_repos_gpg_asc_func);

-+	//g_test_add_func ("/libhif/repos{gpg-wrong-asc}", hif_repos_gpg_wrong_asc_func);

-+	//g_test_add_func ("/libhif/repos{gpg-no-asc}", hif_repos_gpg_no_asc_func);

-+	//g_test_add_func ("/libhif/repos", hif_repos_func);

-+	//g_test_add_func ("/libhif/repos{gpg-no-pubkey}", hif_repos_gpg_no_pubkey_func);

-+	//g_test_add_func ("/libhif/context", hif_context_func);

- 	g_test_add_func ("/libhif/lock", hif_lock_func);

- 	g_test_add_func ("/libhif/lock[threads]", hif_lock_threads_func);

- 	g_test_add_func ("/libhif/source", ch_test_source_func);

deleted file mode 100644

@@ -1,100 +0,0 @@

-Summary:        Simple package manager built on top of hawkey and librepo

-Name:           libhif

-Version:        0.2.3

-Release:        1%{?dist}

-License:        LGPLv2+

-URL:            https://github.com/hughsie/libhif

-Source0:        http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz

-%define sha1    libhif=b5cec26e848e2fb1caf36ec9fcd4c9019e86b566

-Patch0:         libhif-makecheck.patch

-Vendor:         VMware, Inc.

-Distribution:   Photon

-

-BuildRequires:  glib-devel >= 2.16.1

-BuildRequires:  libtool

-BuildRequires:  gtk-doc

-BuildRequires:  gobject-introspection-devel

-BuildRequires:  hawkey-devel >= 0.4.6

-BuildRequires:  rpm-devel >= 4.11.0

-BuildRequires:  librepo-devel >= 1.7.11

-BuildRequires:  libsolv-devel

-BuildRequires:  popt-devel

-BuildRequires:  python2-libs

-BuildRequires:  python2

-BuildRequires:  gobject-introspection-python

-BuildRequires:  openssl-devel

-

-Requires:       openssl

-Requires:       librepo

-Requires:       libsolv

-Requires:       gobject-introspection

-Requires:       hawkey

-Requires:       rpm-libs

-Requires:       glib >= 2.16.1

-

-%description

-This library provides a simple interface to hawkey and librepo and is currently

-used by PackageKit and rpm-ostree.

-

-%package devel

-Summary: GLib Libraries and headers for libhif

-Requires: libhif

-Provides: pkgconfig(libhif)

-

-%description devel

-GLib headers and libraries for libhif.

-

-%prep

-%setup -q

-%patch0 -p1

-%build

-

-./autogen.sh --prefix=/usr \

-    LDFLAGS='-L/usr/lib -lrpm -lrepo' \

-        --enable-gtk-doc \

-        --disable-static \

-        --disable-silent-rules \

-        --disable-dependency-tracking \

-

-make %{?_smp_mflags}

-

-%install

-make install DESTDIR=$RPM_BUILD_ROOT

-rm -f $RPM_BUILD_ROOT%{_libdir}/libhif*.la

-

-%check

-make check

-

-%post -p /sbin/ldconfig

-

-%postun -p /sbin/ldconfig

-

-%files

-%doc README.md AUTHORS NEWS COPYING

-%{_libdir}/libhif.so.1*

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

-

-%files devel

-%{_libdir}/libhif.so

-%{_libdir}/pkgconfig/libhif.pc

-%dir %{_includedir}/libhif

-%{_includedir}/libhif/*.h

-%{_datadir}/gtk-doc

-%{_datadir}/gir-1.0/*.gir

-

-%changelog

-*   Thu Aug 19 2017 Chang Lee <changlee@vmware.com> 0.2.3-1

--   Updated to 0.2.3

--   Disabled GLib-GObject-CRITICAL tests due to Segmentation fault in all tests

-*   Mon Dec 19 2016 Xiaolin Li <xiaolinl@vmware.com> 0.2.2-5

--   BuildRequires libsolv-devel.

-*   Thu Nov 17 2016 Alexey Makhalov <amakhalov@vmware.com> 0.2.2-4

--   Use rpm-libs at runtime

-*   Thu Oct 06 2016 ChangLee <changlee@vmware.com> 0.2.2-3

--   Modified %check

-*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.2.2-2

--   GA - Bump release of all rpms

-*   Tue Feb 23 2016 Kumar Kaushik <kaushikk@vmware.com> 0.2.2-1

--   Updated to new version.

-*   Wed Jun 17 2015 Anish Swaminathan <anishs@vmware.com> 0.2.0-1

--   Updated version

deleted file mode 100644

@@ -1 +0,0 @@

-enable ostree-remount.service

deleted file mode 100644

@@ -1,168 +0,0 @@

-Summary:        Git for operating system binaries

-Name:           ostree

-Version:        2017.4

-Release:        3%{?dist}

-Source0:        http://ftp.gnome.org/pub/GNOME/sources/ostree/%{version}/%{name}-%{version}.tar.gz

-%define sha1    ostree=eb3546c552849ace2f4e3701bc0b826611f569cc

-Source1:        91-ostree.preset

-License:        LGPLv2+

-URL:            http://live.gnome.org/OSTree

-Vendor:         VMware, Inc.

-Distribution:   Photon

-BuildRequires:  git

-BuildRequires:  which

-BuildRequires:  libgsystem-devel

-BuildRequires:  xz-devel

-BuildRequires:  gtk-doc

-BuildRequires:  e2fsprogs-devel

-BuildRequires:  libsoup-devel

-BuildRequires:  autogen

-Requires:       fuse

-Requires:       libgsystem

-Requires:       gpgme

-Requires:       libassuan

-Requires:       libgpg-error

-Requires:       systemd

-Requires:       libsoup

-Requires:       mkinitcpio

-Requires:       dracut

-Requires:       dracut-tools

-Requires:       libarchive

-Requires:		libgsystem

-BuildRequires:  attr-devel

-BuildRequires:  fuse-devel

-BuildRequires:  libgpg-error-devel

-BuildRequires:  python2-libs

-BuildRequires:  python2

-BuildRequires:  gobject-introspection

-BuildRequires:  gobject-introspection-devel

-BuildRequires:  gobject-introspection-python

-BuildRequires:  gpgme-devel

-BuildRequires:  libcap-devel

-BuildRequires:  libsoup

-BuildRequires:  libsoup-devel

-BuildRequires:  mkinitcpio

-BuildRequires:  dracut

-BuildRequires:  dracut-tools

-BuildRequires:  systemd-devel

-BuildRequires:  libarchive

-BuildRequires:  libarchive-devel

-

-%description

-OSTree is a tool for managing bootable, immutable, versioned

-filesystem trees. While it takes over some of the roles of tradtional

-"package managers" like dpkg and rpm, it is not a package system; nor

-is it a tool for managing full disk images. Instead, it sits between

-those levels, offering a blend of the advantages (and disadvantages)

-of both.

-

-%package devel

-Summary: Development headers for %{name}

-Group: Development/Libraries

-Requires: %{name} = %{version}-%{release}

-

-%description devel

-The %{name}-devel package includes the header files for the %{name} library

-

-%prep

-%setup -n %{name}-%{version}

-(git clone git://github.com/GNOME/libglnx libglnx && cd libglnx && git checkout 602fdd9)

-(git clone https://github.com/mendsley/bsdiff bsdiff && cd bsdiff && git checkout 1edf9f6)

-

-%build

-env NOCONFIGURE=1 ./autogen.sh

-%configure \

-    --disable-silent-rules \

-    --enable-gtk-doc \

-    --with-dracut \

-    --with-mkinitcpio \

-    --enable-libsoup-client-certs  \

-    --prefix=%{_prefix}

-make %{?_smp_mflags}

-

-%install

-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

-

-%check

-make %{?_smp_mflags} check

-

-%clean

-rm -rf %{buildroot}

-

-%post

-%systemd_post ostree-remount.service

-

-%preun

-%systemd_preun ostree-remount.service

-

-%postun

-%systemd_postun_with_restart ostree-remount.service

-

-%files

-%doc COPYING README.md

-%{_bindir}/ostree

-%{_bindir}/rofiles-fuse

-%{_libdir}/*.so.1*

-%{_mandir}/man*/*.gz

-%{_prefix}/lib/systemd/system-preset/91-ostree.preset

-%{_prefix}/lib/systemd/system/ostree*.service

-%dir %{_prefix}/lib/dracut/modules.d/*ostree

-%{_prefix}/lib/dracut/modules.d/98ostree/*

-%{_sysconfdir}/grub.d/*ostree

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

-%{_sysconfdir}/ostree-mkinitcpio.conf

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

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

-%{_libexecdir}/libostree/grub2*

-%{_libdir}/initcpio/*

-%{_libdir}/ostree/ostree-prepare-root

-%{_libdir}/ostree/ostree-remount

-%exclude %{_libexecdir}/libostree/ostree-trivial-httpd

-

-

-%files devel

-%{_includedir}/*

-%{_libdir}/lib*.so

-%{_libdir}/pkgconfig/*

-%dir %{_datadir}/gtk-doc/html/ostree

-%{_datadir}/gtk-doc/html/ostree/*

-%{_datadir}/ostree/*

-%{_datadir}/gir-1.0/OSTree-1.0.gir

-

-%changelog

-*   Thu Aug 23 2018 Tapas Kundu <tkundu@vmware.com> 2017.4-3

--   Corrected the git clone path for libglnx.

-*	Mon May 08 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 2017.4-2

--	Use libgsystem-devel to build instead of libgsystem.

-*   Mon Apr 17 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2017.4-1

--   Update to 2017.4

-*   Wed Feb 01 2017 Xiaolin Li <xiaolinl@vmware.com> 2015.7-10

--   libglnx: checkout commit 900b25f.

--   bsdiff:  checkout commit 1edf9f6.

-*   Thu Nov 24 2016 Alexey Makhalov <amakhalov@vmware.com> 2015.7-9

--   BuildRequired attr-devel and libgpg-error-devel

-*   Fri Nov 18 2016 Anish Swaminathan <anishs@vmware.com>  2015.7-8

--   Change systemd dependency

-*   Thu Nov 17 2016 Alexey Makhalov <amakhalov@vmware.com> 2015.7-7

--   Use %setup instead of %autosetup

-*   Fri Oct 07 2016 ChangLee <changlee@vmware.com> 2015.7-6

--   Modified %check

-*   Thu May 26 2016 Divya Thaluru <dthaluru@vmware.com>  2015.7-5

--   Fixed logic to restart the active services after upgrade

-*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2015.7-4

--   GA - Bump release of all rpms

-*   Wed May 04 2016 Anish Swaminathan <anishs@vmware.com> 2015.7-3

--   Remove commented steps.

-*   Sat Jul 11 2015 Touseef Liaqat <tliaqat@vmware.com> 2015.7-2

--   Add dracut, mkinitcpio and libsoup as dependencies

-*   Wed Jun 17 2015 Anish Swaminathan <anishs@vmware.com> 2015.7-1

--   Updated the version

-*   Tue Nov 25 2014 Divya Thaluru <dthaluru@vmware.com> 2014.11-1

--   Initial build. First version

-

deleted file mode 100644

@@ -1,28 +0,0 @@

-diff -dupr a/Makefile-tests.am b/Makefile-tests.am

-+++ b/Makefile-tests.am	2017-09-16 01:16:03.069641948 +0000

-@@ -55,7 +55,7 @@ $(foreach pkg,$(testpackages),$(eval $(c

- 

- tests/common/compose/yum/repo/repodata/repomd.xml: $(testpackages)

- 	(cd tests/common/compose/yum/repo && \

--	 createrepo_c --no-database $$PWD)

-+	 createrepo --no-database $$PWD)

- 

- tests/common/compose/test-repo.repo: tests/common/compose/test-repo.repo.in \

-                                      tests/common/compose/yum/repo/repodata/repomd.xml

-@@ -79,7 +79,6 @@ tests_check_postprocess_LDADD = $(PKGDEP

- 

- tests/check/test-compose.sh: tests/common/compose/test-repo.repo

- 

--tests/check/test-ucontainer.sh: tests/common/compose/test-repo.repo

- 

- uninstalled_test_programs = \

- 	tests/check/jsonutil			\

-@@ -90,7 +89,6 @@ uninstalled_test_programs = \

- uninstalled_test_scripts = \

- 	tests/check/test-basic.sh \

- 	tests/check/test-compose.sh \

--	tests/check/test-ucontainer.sh \

- 	$(NULL)

- 

- uninstalled_test_extra_programs = dbus-run-session

deleted file mode 100644

@@ -1,12 +0,0 @@

-diff -dupr a/tests/check/test-compose.sh b/tests/check/test-compose.sh

-+++ b/tests/check/test-compose.sh	2017-09-15 23:38:06.424734259 +0000

-@@ -31,7 +31,7 @@ export RPMOSTREE_UNINSTALLED_PKGLIBDIR=$

- 

- composedir=${commondir}/compose

- 

--arch=$(arch)

-+arch=x86_64

- if ! test "${arch}" = x86_64; then

-     echo 1>&2 "$0 can be run only on x86_64"; echo "1..0" ; exit 77

- fi

deleted file mode 100644

@@ -1,42 +0,0 @@

-fail() {	local _red="\\033[1;31m"

-	local _normal="\\033[0;39m"

-	[ -n "$*" ] && printf "${_red}$*${_normal}\n"

-	exit 1

-}

-print_message() {

-	printf "%s" "${1}"

-}

-print_failed_in_red() {

-	local _red="\\033[1;31m"

-	local _normal="\\033[0;39m"

-	printf "${_red}%s${_normal}\n" "FAILURE"

-	exit 2

-}

-print_succeeded_in_green() {

-	local _green="\\033[1;32m"

-	local _normal="\\033[0;39m"

-	printf "${_green}%s${_normal}\n" "SUCCESS"

-	return 0

-}

-run_command() {

-	# $1 = message 

-	# $2 = command

-	# $3 = log file

-	local _start=$(date +%s)

-	local _msg="${1}"

-	local _cmd="${2}"

-	local _logfile="${3}"

-	if [ "/dev/null" == "${_logfile}" ]; then

-		print_message "${_msg}: "

-		eval ${_cmd} >> ${_logfile} 2>&1 && print_succeeded_in_green || print_failed_in_red 

-	else

-		print_message "${_msg}: "

-		printf "\n%s\n\n" "###       ${_msg}       ###" >> ${_logfile} 2>&1

-		eval ${_cmd} >> ${_logfile} 2>&1 && print_succeeded_in_green || print_failed_in_red 

-		fi

-

-	local _end=$(date +%s)

-	local _elapsed=$((_end-_start))

-	echo "Elapsed time: ${_elapsed} seconds" >> ${_logfile} 2>&1

-	return 0

-}

deleted file mode 100755

@@ -1,193 +0,0 @@

-#!/bin/bash

-#################################################

-#	Title:	mk-ostree-host			#

-#        Date:	2017-09-22	 		#

-#     Version:	1.0				#

-#      Author:	dheerajs@vmware.com		#

-#     Options:					#

-#################################################

-#	Overview

-#		Creating rpm-ostree host raw file

-#	End

-#

-set -o errexit    # exit if any command returns non true return value

-set -o nounset    # exit if you try to use uninitialised variable

-PRGNAME=${0##*/}  # script name minus the path

-LOGFILE=/var/log/"${PRGNAME}-$(date +%Y-%m-%d).log"

-source $(dirname $0)/function.inc

-NARGS=10

-ARGS_PASSED=$#

-SDA3=/dev/sda3

-

-while [[ $# > 0 ]]

-do

-        key="$1"

-        shift

-

-        case $key in

-                -s|--FILE_SIZE)

-                FILE_SIZE="$1"

-                shift

-        ;;

-                -n|--IMG_NAME)

-                RAW_IMAGE_NAME="$1".raw

-                shift

-        ;;

-                -i|--IP_ADDR)

-                IP_ADDR="$1"

-                shift

-        ;;

-                -r|--REPO_REF)

-                REPO_REF="$1"

-                shift

-        ;;

-                -m|--MOUNT_POINT)

-                MOUNT_POINT="$1"

-                shift

-        ;;

-                -h|--help)

-                echo 'Usage:'

-                echo '-s|--FILE_SIZE           :Total Size in GB. Make sure you have this space in your disk'

-                echo '-n|--RAW_IMAGE_NAME      :Name of the Raw file'

-                echo '-i|--IP_ADDR             :rpm-ostree server IP address'

-                echo '-r|--REPO_REF            :rpm-ostree ref ex. photon/2.0/x86_64/base'

-                echo '-m|--MOUNT_POINT         :mount point ex. /mnt/photon-root'

-                exit 0

-        ;;

-        *)

-                # unknown option

-        ;;

-        esac

-done

-

-if [ $ARGS_PASSED -ne $NARGS ]; then

-   echo "Error in the arguments passed. Try ./mk-ostree-host.sh -h for help"

-   exit 1

-fi

-

-function mount_devices {

-    run_command "Mount devices in deployment" "mount -t bind -o bind,defaults /dev  ${MOUNT_POINT}/ostree/deploy/photon/deploy/${id}.0/dev" "${LOGFILE}"

-    run_command "Mount devices in deployment" "mount -t devpts -o gid=5,mode=620 devpts  ${MOUNT_POINT}/ostree/deploy/photon/deploy/${id}.0/dev/pts" "${LOGFILE}"

-    run_command "Mount devices in deployment" "mount -t tmpfs -o defaults tmpfs  ${MOUNT_POINT}/ostree/deploy/photon/deploy/${id}.0/dev/shm" "${LOGFILE}"

-    run_command "Mount devices in deployment" "mount -t proc -o defaults proc  ${MOUNT_POINT}/ostree/deploy/photon/deploy/${id}.0/proc" "${LOGFILE}"

-    run_command "Mount devices in deployment" "mount -t bind -o bind,defaults /run  ${MOUNT_POINT}/ostree/deploy/photon/deploy/${id}.0/run" "${LOGFILE}"

-    run_command "Mount devices in deployment" "mount -t sysfs -o defaults sysfs ${MOUNT_POINT}/ostree/deploy/photon/deploy/${id}.0/sys" "${LOGFILE}"

-    run_command "Mount Boot" "mount --bind ${MOUNT_POINT}/boot ${MOUNT_POINT}/ostree/deploy/photon/deploy/${id}.0/boot" "${LOGFILE}"

-    run_command "Mount Sysroot" "mount --bind ${MOUNT_POINT} ${MOUNT_POINT}/ostree/deploy/photon/deploy/${id}.0/sysroot" "${LOGFILE}"

-}

-function unmount_devices {

-    sync

-    sync

-    sync

-    run_command "Unmount Boot" "umount ${MOUNT_POINT}/ostree/deploy/photon/deploy/${id}.0/boot" "${LOGFILE}"

-    run_command "Unmount sysroot" "umount ${MOUNT_POINT}/ostree/deploy/photon/deploy/${id}.0/sysroot" "${LOGFILE}"

-    run_command "Unmount devices in deployment" "umount ${MOUNT_POINT}/ostree/deploy/photon/deploy/${id}.0/sys" "${LOGFILE}"

-    run_command "Unmount devices in deployment" "umount ${MOUNT_POINT}/ostree/deploy/photon/deploy/${id}.0/run" "${LOGFILE}"

-    run_command "Unmount devices in deployment" "umount ${MOUNT_POINT}/ostree/deploy/photon/deploy/${id}.0/proc" "${LOGFILE}"

-    run_command "Unmount devices in deployment" "umount ${MOUNT_POINT}/ostree/deploy/photon/deploy/${id}.0/dev/shm" "${LOGFILE}"

-    run_command "Unmount devices in deployment" "umount ${MOUNT_POINT}/ostree/deploy/photon/deploy/${id}.0/dev/pts" "${LOGFILE}"

-    run_command "Unmount devices in deployment" "umount ${MOUNT_POINT}/ostree/deploy/photon/deploy/${id}.0/dev" "${LOGFILE}"

-}

-

-function create_systemd_tmpfile {

-    run_command "Create systemd-tmpfiles" "systemd-tmpfiles --create --boot --root=${MOUNT_POINT}/ostree/deploy/photon/deploy/${id}.0 --prefix=/var/home" "${LOGFILE}"

-    run_command "Create systemd-tmpfiles" "systemd-tmpfiles --create --boot --root=${MOUNT_POINT}/ostree/deploy/photon/deploy/${id}.0 --prefix=/var/roothome" "${LOGFILE}"

-    run_command "Create systemd-tmpfiles" "systemd-tmpfiles --create --boot --root=${MOUNT_POINT}/ostree/deploy/photon/deploy/${id}.0 --prefix=/var/lib/rpm" "${LOGFILE}"

-    run_command "Create systemd-tmpfiles" "systemd-tmpfiles --create --boot --root=${MOUNT_POINT}/ostree/deploy/photon/deploy/${id}.0 --prefix=/var/opt" "${LOGFILE}"

-    run_command "Create systemd-tmpfiles" "systemd-tmpfiles --create --boot --root=${MOUNT_POINT}/ostree/deploy/photon/deploy/${id}.0 --prefix=/var/srv" "${LOGFILE}"

-    run_command "Create systemd-tmpfiles" "systemd-tmpfiles --create --boot --root=${MOUNT_POINT}/ostree/deploy/photon/deploy/${id}.0 --prefix=/var/userlocal" "${LOGFILE}"

-    run_command "Create systemd-tmpfiles" "systemd-tmpfiles --create --boot --root=${MOUNT_POINT}/ostree/deploy/photon/deploy/${id}.0 --prefix=/var/mnt" "${LOGFILE}"

-    run_command "Create systemd-tmpfiles" "systemd-tmpfiles --create --boot --root=${MOUNT_POINT}/ostree/deploy/photon/deploy/${id}.0 --prefix=/var/spool/mail" "${LOGFILE}"

-}

-

-function unmount_loop_devices {

-    sync

-    sync

-    sync

-    run_command "Unmounting p2" "umount -l ${SYSROOT_BOOT_PARTITION}" "${LOGFILE}"

-    run_command "Unmounting p3" "umount -l ${ROOT_PARTITION}" "${LOGFILE}"

-    run_command "kpartx loop0" "kpartx -d ${DISK_DEVICE}" "${LOGFILE}"

-    run_command "delete loop0" "losetup -d ${DISK_DEVICE}" "${LOGFILE}"

-}

-

-function rpm_ostree_init_deploy {

-    run_command "Init the Ostree Repo" "ostree --repo=${MOUNT_POINT}/repo init --mode=archive-z2" "${LOGFILE}"

-    run_command "Ostree Init FS" "ostree admin --sysroot=${MOUNT_POINT} init-fs ${MOUNT_POINT}" "${LOGFILE}"

-    run_command "Add Remote" "ostree remote add --repo=${MOUNT_POINT}/ostree/repo --set=gpg-verify=false photon http://${IP_ADDR}" "${LOGFILE}"

-    run_command "Pull Repo" "ostree pull --repo=${MOUNT_POINT}/ostree/repo photon ${REPO_REF}" "${LOGFILE}"

-    run_command "Init-OS" "ostree admin --sysroot=${MOUNT_POINT} os-init photon" "${LOGFILE}"

-    run_command "Deploy Ostree" "ostree admin --sysroot=${MOUNT_POINT} deploy --os=photon photon:${REPO_REF}" "${LOGFILE}"

-}

-

-function install_generate_grub {

-    run_command "Install grub" "chroot ${MOUNT_POINT}/ostree/deploy/photon/deploy/${id}.0 bash -c \"grub2-install ${DISK_DEVICE}\"" "${LOGFILE}"

-    run_command "Generate grub.cfg file" "chroot ${MOUNT_POINT}/ostree/deploy/photon/deploy/${id}.0 bash -c \"grub2-mkconfig -o /boot/grub2/grub.cfg\"" "${LOGFILE}"

-    run_command "Set boot volume in grub config file" "chroot ${MOUNT_POINT}/ostree/deploy/photon/deploy/${id}.0 bash -c \"ostree admin instutil set-kargs root=${ROOT_PARTITION}\"" "${LOGFILE}"

-    run_command "Replace ${ROOT_PARTITION} with ${SDA3} in cfg file" "sed -i 's:${ROOT_PARTITION}:${SDA3}:' ${MOUNT_POINT}/ostree/deploy/photon/deploy/${id}.0/boot/loader/grub.cfg" "${LOGFILE}"

-    run_command "Replace ${ROOT_PARTITION} with ${SDA3} in loader conf file" "sed -i 's:${ROOT_PARTITION}:${SDA3}:' ${MOUNT_POINT}/ostree/deploy/photon/deploy/${id}.0/boot/loader/entries/ostree-photon-0.conf" "${LOGFILE}"

-    run_command "Remove grub config from /boot/grub2" "chroot ${MOUNT_POINT}/ostree/deploy/photon/deploy/${id}.0 bash -c \"rm /boot/grub2/grub.cfg\"" "${LOGFILE}"

-    run_command "Create a link file to /boot/loader/grub.cfg from /boot/grub2" "chroot ${MOUNT_POINT}/ostree/deploy/photon/deploy/${id}.0 bash -c \"cd /boot/grub2/ && ln -sf ../loader/grub.cfg ./grub.cfg\"" "${LOGFILE}"

-}

-

-function update_fstab {

-    run_command "Update /etc/fstab in chroot for /dev/sda3" "echo \"/dev/sda3    /        ext4   defaults   1 1  \" >> ${MOUNT_POINT}/ostree/deploy/photon/deploy/${id}.0/etc/fstab" "${LOGFILE}"

-    run_command "Update /etc/fstab in chroot for /dev/sda2" "echo \"/dev/sda2    /boot    ext4   defaults   1 2  \" >> ${MOUNT_POINT}/ostree/deploy/photon/deploy/${id}.0/etc/fstab" "${LOGFILE}"

-}

-

-function create_password {

-    run_command "Echo password to a file. Change this password" "echo \"root:changeme\" >> ${MOUNT_POINT}/ostree/deploy/photon/deploy/${id}.0/root/mypwdfile" "${LOGFILE}"

-    run_command "Change Password of root to changeme" "chroot ${MOUNT_POINT}/ostree/deploy/photon/deploy/${id}.0 bash -c \"cat root/mypwdfile | chpasswd\"" "${LOGFILE}"

-    run_command "Delete the temporary mypwdfile" "rm ${MOUNT_POINT}/ostree/deploy/photon/deploy/${id}.0/root/mypwdfile" "${LOGFILE}"

-}

-

-run_command "Install gptfdisk kpartx and device-mapper-devel" "tdnf -y install gptfdisk kpartx device-mapper-devel device-mapper-libs" "${LOGFILE}"

-

-echo "Creating raw disk file " $RAW_IMAGE_NAME " of size " $FILE_SIZE

-dd if=/dev/zero of=$RAW_IMAGE_NAME bs=1 seek=$(($FILE_SIZE * 1024 * 1024 * 1024)) count=0

-chmod 755 $RAW_IMAGE_NAME

-

-echo "Associating loopdevice to raw disk"

-DISK_DEVICE=`losetup --show -f $RAW_IMAGE_NAME`

-

-echo "Creating partition on raw disk"

-sgdisk -n 1::+2M -n 2::+300M -n 3: -p $DISK_DEVICE 

-sgdisk -t1:ef02 $DISK_DEVICE

-

-echo "Mapping device partition to loop device"

-kpartx -avs $DISK_DEVICE

-

-DEVICE_NAME=`echo $DISK_DEVICE|cut -c6- `

-

-echo "Adding file system to device partition"

-mkfs -t ext4 /dev/mapper/${DEVICE_NAME}p2

-mkfs -t ext4 /dev/mapper/${DEVICE_NAME}p3

-

-ROOT_PARTITION=/dev/mapper/${DEVICE_NAME}p3

-SYSROOT_BOOT_PARTITION=/dev/mapper/${DEVICE_NAME}p2

-

-SYSROOT_BOOT=${MOUNT_POINT}/boot

-SYSROOT_OSTREE=${MOUNT_POINT}/ostree

-

-run_command "Making Mount Point Directory" "mkdir -p ${MOUNT_POINT}" "${LOGFILE}"

-run_command "Mount Root" "mount ${ROOT_PARTITION} ${MOUNT_POINT}" "$LOGFILE"

-run_command "Making Sysroot Boot Directory" "mkdir -p ${SYSROOT_BOOT}" "${LOGFILE}"

-run_command "Mount Sysroot Boot" "mount ${SYSROOT_BOOT_PARTITION} ${SYSROOT_BOOT}" "${LOGFILE}"

-run_command "Make repo directory for ostree" "mkdir -p ${MOUNT_POINT}/repo" "${LOGFILE}"

-

-rpm_ostree_init_deploy

-

-id=$(cat ${MOUNT_POINT}/ostree/repo/refs/remotes/photon/${REPO_REF})

-

-create_systemd_tmpfile

-

-mount_devices

-

-install_generate_grub

-

-update_fstab

-

-create_password

-

-unmount_devices

-

-unmount_loop_devices

deleted file mode 100644

@@ -1,16 +0,0 @@

-+++ libdnf/CMakeLists.txt.1	2017-04-20 22:37:56.727077768 +0000

-@@ -26,10 +26,11 @@

- 

- # hawkey dependencies

- find_package (PkgConfig REQUIRED)

-+SET (CMAKE_MODULE_PATH /usr/share/cmake/Modules)

-+find_package (LibSolv 0.6.26 REQUIRED COMPONENTS ext)

- SET (CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)

- PKG_CHECK_MODULES(GLIB gio-unix-2.0>=2.44.0 REQUIRED)

- FIND_LIBRARY (RPMDB_LIBRARY NAMES rpmdb)

--find_package (LibSolv 0.6.21 REQUIRED COMPONENTS ext)

- if (ENABLE_RHSM_SUPPORT)

-     pkg_check_modules (RHSM REQUIRED librhsm)

-     include_directories (${RHSM_INCLUDE_DIRS})

-

deleted file mode 100644

@@ -1,156 +0,0 @@

-Summary:        Commit RPMs to an OSTree repository

-Name:           rpm-ostree

-Version:        2017.4

-Release:        8%{?dist}

-Source0:        rpm-ostree-%{version}.tar.gz

-%define sha1    rpm-ostree=d34882a455afbf0b57617c0962725276967e838a

-Source1:        libglnx-0c52d85.tar.gz

-%define sha1    libglnx=137767ad957f37d6210aaa6b28e4333a42aa9fad

-Source2:        libdnf-2086268.tar.gz

-%define sha1    libdnf=4e913da416c61a5525f94ef09f38c658179e3e25

-Source3:        mk-ostree-host.sh

-Source4:        function.inc

-Patch0:         rpm-ostree-libdnf-build.patch

-Patch1:         Set-arch.patch

-Patch2:         Makefile-test.patch

-License:        LGPLv2+

-URL:            https://github.com/projectatomic/rpm-ostree

-Vendor:         VMware, Inc.

-Distribution:   Photon

-# We always run autogen.sh

-BuildRequires:  autoconf

-BuildRequires:  automake

-BuildRequires:  check

-BuildRequires:  cmake

-BuildRequires:  libtool

-BuildRequires:  git

-BuildRequires:  json-glib-devel

-BuildRequires:  gtk-doc

-BuildRequires:  libcap-devel

-BuildRequires:  ostree-devel

-BuildRequires:  libgsystem-devel

-BuildRequires:  docbook-xsl

-BuildRequires:  libxslt

-BuildRequires:  gobject-introspection-devel

-BuildRequires:  openssl-devel

-BuildRequires:  rpm-devel >= 4.11.0

-BuildRequires:  librepo-devel >= 1.7.11

-BuildRequires:  attr-devel

-BuildRequires:  python2-libs

-BuildRequires:  python2

-BuildRequires:  gobject-introspection-python

-BuildRequires:  autogen

-BuildRequires:  libsolv-devel >= 0.6.26-3

-BuildRequires:  systemd-devel

-BuildRequires:  libarchive-devel

-BuildRequires:  gperf

-BuildRequires:  which

-BuildRequires:  popt-devel

-BuildRequires:  createrepo_c

-BuildRequires:  jq

-BuildRequires:  photon-release

-BuildRequires:  photon-repos

-BuildRequires:  bubblewrap

-BuildRequires:  dbus

-

-Requires:       libcap

-Requires:       librepo

-Requires:       openssl

-Requires:       ostree

-Requires:       libgsystem

-Requires:       json-glib

-Requires:       libsolv >= 0.6.26-3

-Requires:       bubblewrap

-

-%description

-This tool takes a set of packages, and commits them to an OSTree

-repository.  At the moment, it is intended for use on build servers.

-

-%package devel

-Summary: Development headers for rpm-ostree

-Group: Development/Libraries

-Requires: %{name} = %{version}-%{release}

-

-%description devel

-Includes the header files for the rpm-ostree library.

-

-%package host

-Summary: File for rpm-ostree-host creation

-Group: Development/Libraries

-Requires: %{name} = %{version}-%{release}

-

-%description host

-Includes the scripts for rpm-ostree host creation

-

-%prep

-%setup -q

-tar xf /usr/src/photon/SOURCES/libglnx-0c52d85.tar.gz --no-same-owner

-tar xf /usr/src/photon/SOURCES/libdnf-2086268.tar.gz --no-same-owner

-%patch0 -p0

-%patch1 -p1

-%patch2 -p1

-

-%build

-sed -i '/-DBUILD_SHARED_LIBS/a -DWITH_MAN=OFF \\' configure.ac

-env NOCONFIGURE=1 ./autogen.sh

-%configure --disable-silent-rules --enable-gtk-doc

-make %{?_smp_mflags}

-

-%install

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

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

-install -d %{buildroot}%{_bindir}/rpm-ostree-host

-install -p -m 755 -D %{SOURCE3} %{buildroot}%{_bindir}/rpm-ostree-host

-install -p -m 644 -D %{SOURCE4} %{buildroot}%{_bindir}/rpm-ostree-host

-%check

-make check

-

-%files

-%{_bindir}/*

-%{_libdir}/%{name}/

-%{_mandir}/man*/*.gz

-%{_libdir}/*.so.1*

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

-%{_sysconfdir}/dbus-1/system.d/*

-%{_prefix}%{_unitdir}/*.service

-%{_libexecdir}/*

-%{_datadir}/dbus-1/system-services/*

-

-%files devel

-%{_libdir}/lib*.so

-%{_includedir}/*

-%{_libdir}/pkgconfig/*

-%{_datadir}/gtk-doc/html/*

-%{_datadir}/gir-1.0/*-1.0.gir

-

-%files host

-%{_bindir}/rpm-ostree-host/mk-ostree-host.sh

-%{_bindir}/rpm-ostree-host/function.inc

-

-%changelog

-*   Mon Jun 04 2018 Xiaolin Li <xiaolinl@vmware.com> 2017.4-8

--   Rebuild with createrepo_c after removed createrepo.

-*   Tue Oct 03 2017 Dheeraj Shetty <dheerajs@vmware.com> 2017.4-7

--   Remove hardcoded /dev/loop0

-*   Tue Sep 26 2017 Dheeraj Shetty <dheerajs@vmware.com> 2017.4-6

--   Fix unmount in the mk-ostree-host

-*   Fri Sep 22 2017 Dheeraj Shetty <dheerajs@vmware.com> 2017.4-5

--   Add support to generate rpm-ostree host

-*   Fri Sep 15 2017 Dheeraj Shetty <dheerajs@vmware.com> 2017.4-4

--   Changes for Makecheck

-*   Thu Aug 03 2017 Xiaolin Li <xiaolinl@vmware.com> 2017.4-3

--   Added bubblewrap to requires.

-*   Mon May 08 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 2017.4-2

--   Use libgsystem-devel to build instead of libgsystem.

-*   Fri Apr 21 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2017.4-1

--   Update to 2017.4

-*   Mon Dec 19 2016 Xiaolin Li <xiaolinl@vmware.com> 2015.7-5

--   BuildRequires libsolv-devel.

-*   Thu Nov 24 2016 Alexey Makhalov <amakhalov@vmware.com> 2015.7-4

--   BuildRequired attr-devel.

-*   Wed Oct 05 2016 ChangLee <changlee@vmware.com> 2015.7-3

--   Modified %check

-*   Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2015.7-2

--   GA - Bump release of all rpms

-*   Thu Jun 18 2015 Anish Swaminathan <anishs@vmware.com> 2015.7-1

--   Added new version of rpm-ostree

@@ -18,12 +18,6 @@

         "visible" : true,

         "include" : ["minimal"]

     },

-    "ostree_server" : {

-        "title" : "3. Photon OSTree Server",

-        "file" : "packages_ostree_server.json",

-        "visible" : true,

-        "include" : ["minimal"]

-    },

     "appliance" : {

         "title" : "Minimal packages to support appliances.",

         "file" : "packages_appliance.json",

@@ -96,9 +96,6 @@

         "libsoup",

         "asciidoc",

         "mkinitcpio",

-        "ostree",

-        "libhif",

-        "rpm-ostree",

         "glibmm",

         "deltarpm",

         "cdrkit",

@@ -5,5 +5,5 @@

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

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

                   "hawkey", "python3","python3-libs","pcre","glib", "tdnf", "python3-requests",

-                  "grub2-pc", "grub2-efi", "dracut", "curl", "ostree", "dosfstools"]

+                  "grub2-pc", "grub2-efi", "dracut", "curl", "dosfstools"]

 }

deleted file mode 100644

@@ -1,15 +0,0 @@

-{

-    "packages": ["gc", "libunistring", "libffi", "libltdl", "gmp", "guile", "openssl",

-                 "autogen", "ncurses", "ncurses-compat", "ca-certificates", "libtasn1", "e2fsprogs", "nettle",

-                 "bzip2", "e2fsprogs-devel", "xz", "readline", "glibc", "sqlite-libs",

-                 "bash", "python2", "python2-libs", "python-xml", "nspr", "gnutls", "filesystem", "libgcc", "krb5",

-                 "libassuan", "libxml2", "expat", "gdbm", "openssl-devel", "popt", "curl",

-                 "nss", "gpgme", "systemd", "libsolv", "coreutils", "lua", "libgpg-error",

-                 "elfutils-libelf", "libcap", "glib", "glib-networking", "file", "Linux-PAM",

-                 "kmod", "util-linux", "libstdc++", "attr", "zlib", "rpm", "pcre", "perl",

-                 "cyrus-sasl", "libsoup", "libdb", "hawkey", "librepo", "dracut", "libxml2-devel",

-                 "libarchive", "apr", "hawkey-devel", "gobject-introspection", "librepo-devel",

-                 "rpm-devel", "libarchive-devel", "libgsystem", "dracut-tools", "libsoup-devel",

-                 "mkinitcpio", "openldap", "postgresql", "libhif", "json-glib", "apr-util",

-                 "ostree", "httpd", "rpm-ostree"]

-}

@@ -4,5 +4,5 @@ The [FAQ for Photon OS](https://github.com/vmware/photon/wiki/Frequently-Asked-Q

 Technical information about Photon OS and instructions on how to use it appear in the [Photon OS Administration Guide](https://github.com/vmware/photon/blob/master/docs/photon-admin-guide.md). 

-Getting-started guides and how-to articles covering Docker, Mesos, OSTree, VMware platforms, and other technologies appear on the Photon OS [Wiki](https://github.com/vmware/photon/wiki).

+Getting-started guides and how-to articles covering Docker, Mesos, VMware platforms, and other technologies appear on the Photon OS [Wiki](https://github.com/vmware/photon/wiki).

@@ -85,7 +85,6 @@

         GCE](#running-a-photon-os-machine-on-gce)

 -   [Docker Containers](#docker-containers)

 -   [Kubernetes](#kubernetes)

--   [RPM-OSTree](#rpm-ostree)

 -   [Installing Sendmail](#installing-sendmail)

     -   [Fixing Sendmail If Installed Before an FQDN Was

         Set](#fixing-sendmail-if-installed-before-an-fqdn-was-set)

@@ -115,7 +114,7 @@ This guide describes the fundamentals of administering Photon OS, the open-sourc

 The guide covers the basics of managing packages, controlling services with systemd, setting up networking, initializing Photon OS with cloud-init, running Docker containers, and working with other technologies, such as Kubernetes. The guide also includes a section to get you started using Photon OS quickly and easily. 

-Photon OS is a Linux container host optimized for vSphere and cloud-computing platforms such as Amazon Elastic Compute and Google Compute Engine. As a lightweight and extensible operating system, Photon OS works with the most common container formats, including Docker, Rocket, and Garden. Photon OS includes a yum-compatible, package-based lifecycle management system called tdnf. Photon OS optionally works with RPM-OSTree for image-based system versioning.

+Photon OS is a Linux container host optimized for vSphere and cloud-computing platforms such as Amazon Elastic Compute and Google Compute Engine. As a lightweight and extensible operating system, Photon OS works with the most common container formats, including Docker, Rocket, and Garden. Photon OS includes a yum-compatible, package-based lifecycle management system called tdnf.

 When used with development tools and environments such as VMware Fusion, VMware Workstation, HashiCorp (Vagrant and Atlas), and production runtime environments (vSphere, vCloud Air), Photon OS lets you seamlessly migrate container-based applications from development to production. With a small footprint and fast boot and run times, Photon OS is optimized for cloud computing and cloud  applications.