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

 Summary:	initramfs

 Name:		initramfs

 Version:	2.0

-Release:	2%{?dist}

+Release:	3%{?dist}

 Source0:	fscks.conf

 License:	Apache License

 Group:		System Environment/Base

@@ -18,53 +18,92 @@ mkdir -p %{buildroot}%{_sysconfdir}/dracut.conf.d

 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

+%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 removal_action \

-rm -rf %{_localstatedir}/lib/rpm-state/initramfs.regenerate \

-rm -rf %{_localstatedir}/lib/rpm-state/initramfs.pending

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

-%define pkgs_trigger_action \

-[ -f %{_localstatedir}/lib/rpm-state/initramfs.regenerate ] && exit 0 \

-mkdir -p %{_localstatedir}/lib/rpm-state \

-touch %{_localstatedir}/lib/rpm-state/initramfs.regenerate \

-echo "initramfs (re)generation triggered" >&2

+# How it works:

+#

+# We would like initramfs generation to happen if a given set of packages

+# are changed, including installing/upgrading/uninstalling.

+#

+# Hence, Two sets of triggers:

+#

+# package triggers for setting the `regenerate` flag

+# upon critical package install/upgrade/uninstall

+#

+# file transaction triggers which overlaps the set of files in those packages

+# so that we have an opportunity to check for the flag and (re)generate

+# initrd for all the kernels.

+#

+# All the flags will be put in /var/lib/rpm-state/initramfs

+#

+# This ensures the easy removal of the intermediate state,

+# postun is essential here, as it guarantees that no intermediate states

+# will be left over for the new initramfs rpm, since triggerin/un

+# in the new rpm will execute after the postun in the old rpm

+#

+# The order of the scriptlet is critical. The heavy lifting mkinitrd is

+# always done post transaction, as it's always invoked in posttrans/

+# transfiletriggerin/transfiletriggerpostun. Whereas the creation of flag

+# is in the middle of transaction.

+#

+# The kernel rpm has triggers for initramfs. This is an optimization, as

+# we don't want mkinitrd be invoked for all the kernels if some of the kernel

+# rpms is being installed/upgraded/uninstalled. Hence, there is no trigger

+# in initramfs watching for linux, but there is file transaction trigger

+# watching for /lib/modules. The triggerin in linux.rpm will create flag as

+#

+# pending/%{uname_r}

+#

+# which indicates only the corresponding initrd will be (re)generated, and

+# the triggerun in linux.rpm will remove the corresponding initrd.

-%define file_trigger_action \

+%define pkgs_trigger_action() \

+[ -f %{_localstatedir}/lib/rpm-state/initramfs/regenerate ] && exit 0 \

+mkdir -p %{_localstatedir}/lib/rpm-state/initramfs \

+touch %{_localstatedir}/lib/rpm-state/initramfs/regenerate \

+echo "initramfs (re)generation" %* >&2

+

+%define file_trigger_action() \

 cat > /dev/null \

-if [ -f %{_localstatedir}/lib/rpm-state/initramfs.regenerate ]; then \

-    echo "(re)generate initramfs for all kernels" >&2 \

+if [ -f %{_localstatedir}/lib/rpm-state/initramfs/regenerate ]; then \

+    echo "(re)generate initramfs for all kernels," %* >&2 \

     mkinitrd -q \

-elif [ -d %{_localstatedir}/lib/rpm-state/initramfs.pending ]; then \

-    for k in `ls %{_localstatedir}/lib/rpm-state/initramfs.pending/`; do \

-        echo "generate initramfs for $k" >&2 \

+elif [ -d %{_localstatedir}/lib/rpm-state/initramfs/pending ]; then \

+    for k in `ls %{_localstatedir}/lib/rpm-state/initramfs/pending/`; do \

+        echo "(re)generate initramfs for $k," %* >&2 \

         mkinitrd -q /boot/initrd.img-$k $k \

     done; \

 fi \

-%{removal_action}

+%removal_action

-%post

-%{pkgs_trigger_action}

+%posttrans

+echo "initramfs" %{version}-%{release} "posttrans" >&2

+%removal_action

+mkinitrd -q

 %postun

-[ $1 -eq 0 ] || exit 0

-%{removal_action}

-

-%posttrans

-%{file_trigger_action}

+echo "initramfs" %{version}-%{release} "postun" >&2

+#cleanup the states

+%removal_action

 %triggerin -- %{watched_pkgs}

-%{pkgs_trigger_action}

+[ $1 -gt 1 ] && exit 0

+#Upgrading, let the posttrans of new initramfs handles it

+%pkgs_trigger_action triggerin $* %{version}-%{release}

 %triggerun -- %{watched_pkgs}

-%{pkgs_trigger_action}

+[ $1 -eq 0 ] && exit 0

+#Uninstalling, let the linux.rpm removes initrd for themselves

+%pkgs_trigger_action triggerun $* %{version}-%{release}

 %transfiletriggerin -- %{watched_path}

-%{file_trigger_action}

+%file_trigger_action transfilertriggerin %{version}-%{release}

 %transfiletriggerpostun -- %{watched_path}

-%{file_trigger_action}

+%file_trigger_action transfiletriggerpostun %{version}-%{release}

 %files

 %defattr(-,root,root,-)

@@ -72,6 +111,8 @@ fi \

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

 %changelog

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

 -   Discard stdin before dracut

 *   Wed Apr 12 2017 Bo Gan <ganb@vmware.com> 2.0-1

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

 %triggerin -- initramfs

-mkdir -p %{_localstatedir}/lib/rpm-state/initramfs/kernel.pending

-touch %{_localstatedir}/lib/rpm-state/initramfs/kernel.pending/%{uname_r}

+mkdir -p %{_localstatedir}/lib/rpm-state/initramfs/pending

+touch %{_localstatedir}/lib/rpm-state/initramfs/pending/%{uname_r}

 echo "initrd generation of kernel %{uname_r} will be triggered later" >&2

 %triggerun -- initramfs

-rm -rf %{_localstatedir}/lib/rpm-state/initramfs/kernel.pending/%{uname_r}

+rm -rf %{_localstatedir}/lib/rpm-state/initramfs/pending/%{uname_r}

 rm -rf /boot/initrd.img-%{uname_r}

 echo "initrd of kernel %{uname_r} removed" >&2

@@ -2,7 +2,7 @@

 Summary:        Kernel

 Name:           linux-esx

 Version:        4.9.38

-Release:        2%{?dist}

+Release:        3%{?dist}

 License:        GPLv2

 URL:            http://www.kernel.org/

 Group:          System Environment/Kernel

@@ -187,6 +187,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg

 /usr/src/linux-headers-%{uname_r}

 %changelog

+*   Wed Jul 26 2017 Bo Gan <ganb@vmware.com> 4.9.38-3

+-   Fix initramfs triggers

 *   Thu Jul 20 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.38-2

 -   Disable scheduler beef up patch

 *   Tue Jul 18 2017 Alexey Makhalov <amakhalov@vmware.com> 4.9.38-1

@@ -2,7 +2,7 @@

 Summary:        Kernel

 Name:           linux-secure

 Version:        4.9.38

-Release:        5%{?dist}

+Release:        6%{?dist}

 License:        GPLv2

 URL:            http://www.kernel.org/

 Group:          System Environment/Kernel

@@ -255,6 +255,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg

 /usr/src/linux-headers-%{uname_r}

 %changelog

+*   Fri Aug 04 2017 Bo Gan <ganb@vmware.com> 4.9.38-6

+-   Fix initramfs triggers

 *   Tue Aug 01 2017 Anish Swaminathan <anishs@vmware.com> 4.9.38-5

 -   Allow some algorithms in FIPS mode

 -   Reverts 284a0f6e87b0721e1be8bca419893902d9cf577a and backports

@@ -2,7 +2,7 @@

 Summary:        Kernel

 Name:           linux

 Version:        4.9.38

-Release:        5%{?dist}

+Release:        6%{?dist}

 License:    	GPLv2

 URL:        	http://www.kernel.org/

 Group:        	System Environment/Kernel

@@ -295,6 +295,8 @@ ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg

 /usr/share/doc/*

 %changelog

+*   Fri Aug 04 2017 Bo Gan <ganb@vmware.com> 4.9.38-6

+-   Fix initramfs triggers

 *   Tue Aug 01 2017 Anish Swaminathan <anishs@vmware.com> 4.9.38-5

 -   Allow some algorithms in FIPS mode

 -   Reverts 284a0f6e87b0721e1be8bca419893902d9cf577a and backports