#1 Drop default boot-duration
Merged 2 years ago by rstrode. Opened 2 years ago by walters.
rpms/ walters/plymouth drop-boot-duration  into  master

Drop default boot-duration
Colin Walters • 2 years ago  
file modified

@@ -258,7 +258,6 @@ 


  mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/plymouth

  cp $RPM_SOURCE_DIR/boot-duration $RPM_BUILD_ROOT%{_datadir}/plymouth/default-boot-duration

- cp $RPM_SOURCE_DIR/boot-duration $RPM_BUILD_ROOT%{_localstatedir}/lib/plymouth

  cp -f $RPM_SOURCE_DIR/plymouth-update-initrd $RPM_BUILD_ROOT%{_libexecdir}/plymouth


  # Add charge, our new default

@@ -269,9 +268,6 @@ 

  # Drop glow, it's not very Fedora-y

  rm -rf $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/glow


- %post

- [ -f %{_localstatedir}/lib/plymouth/boot-duration ] || cp -f %{_datadir}/plymouth/default-boot-duration %{_localstatedir}/lib/plymouth/boot-duration



  if [ $1 -eq 0 ]; then

      rm -f %{_libdir}/plymouth/default.so

The file was last updated in 2008, which was kind of a while ago.
Having files in /var conflicts with the rpm-ostree model of
/var starting empty.

Further, I don't think it makes sense to have a global boot
duration - it should likely be per-Fedora Edition. So probably
we should delete the one in /usr as well and have the Edition
packages carry it or something.

Specifically this fixes rpm-ostree compose tree --ex-unified-core which makes /var read-only. See also https://bugzilla.redhat.com/show_bug.cgi?id=1352154

Pull-Request has been merged by rstrode

2 years ago