rpms/initial-setup
5
0
Fork 0
Code Issues Pull Requests Releases Activity

new version

Browse Source 
- Remove old failing pre scriptlet (mkolman)
This commit is contained in:
Martin Kolman 2021-03-30 21:55:43 +02:00
parent de0480c636
commit c04f32381a
3 changed files with 6 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -86,3 +86,4 @@
/initial-setup-0.3.87.tar.gz
/initial-setup-0.3.88.tar.gz
/initial-setup-0.3.89.tar.gz
/initial-setup-0.3.90.tar.gz

59
initial-setup.spec
View File

@ -1,7 +1,7 @@
Summary: Initial system configuration utility
Name: initial-setup
URL: https://fedoraproject.org/wiki/InitialSetup
Version: 0.3.89
Version: 0.3.90
Release: 1%{?dist}
# This is a Red Hat maintained package which is specific to
@ -70,33 +70,6 @@ make DESTDIR=%{buildroot} install
%clean
rm -rf %{buildroot}
%pre
# There is a possibility that an initial setup service might be running
# during package upgrade, which can together with an old version
# of initial setup (<= 0.3.36) cause the rpm transaction to deadlock.
# So turn of and disable any Initial Setup services if the pre
# scriptlet is running during upgrade or package removal to prevent
# the deadlock.
# upgrade or package removal only
if [ $1 -gt 1 ] ; then
IS_GRAPHICAL="initial-setup-graphical.service"
IS_TEXT="initial-setup-text.service"
IS_GRAPHICAL_AVAILABLE=0
IS_TEXT_AVAILABLE=0
# check if the Initial Setup unit is enabled and the executable is available
systemctl is-enabled $IS_GRAPHICAL && IS_GRAPHICAL_AVAILABLE=1
systemctl is-enabled $IS_TEXT && IS_TEXT_AVAILABLE=1
if [ $IS_GRAPHICAL_AVAILABLE -eq 1 ]; then
systemctl stop $IS_GRAPHICAL
systemctl disable $IS_GRAPHICAL
fi
if [ $IS_TEXT_AVAILABLE -eq 1 ]; then
systemctl stop $IS_TEXT
systemctl disable $IS_TEXT
fi
fi
%post
%systemd_post initial-setup.service
@ -106,33 +79,6 @@ fi
%postun
%systemd_postun initial-setup.service
%pre gui
# There is a possibility that an initial setup service might be running
# during package upgrade, which can together with an old version
# of initial setup (<= 0.3.36) cause the rpm transaction to deadlock.
# So turn off and disable any Initial Setup services if the pre
# scriptlet is running during upgrade or package removal to prevent
# the deadlock.
# upgrade or package removal only
if [ $1 -gt 1 ] ; then
IS_GRAPHICAL="initial-setup-graphical.service"
IS_TEXT="initial-setup-text.service"
IS_GRAPHICAL_AVAILABLE=0
IS_TEXT_AVAILABLE=0
# check if the Initial Setup unit is enabled and the executable is available
systemctl is-enabled $IS_GRAPHICAL && IS_GRAPHICAL_AVAILABLE=1
systemctl is-enabled $IS_TEXT && IS_TEXT_AVAILABLE=1
if [ $IS_GRAPHICAL_AVAILABLE -eq 1 ]; then
systemctl stop $IS_GRAPHICAL
systemctl disable $IS_GRAPHICAL
fi
if [ $IS_TEXT_AVAILABLE -eq 1 ]; then
systemctl stop $IS_TEXT
systemctl disable $IS_TEXT
fi
fi
%files -f %{name}.lang
%doc README.rst ChangeLog
%license COPYING
@ -158,6 +104,9 @@ fi
%{python3_sitelib}/initial_setup/gui/*
%changelog
* Tue Mar 30 2021 Martin Kolman <mkolman@redhat.com> - 0.3.90-1
- Remove old failing pre scriptlet (mkolman)
* Tue Mar 23 2021 Martin Kolman <mkolman@redhat.com> - 0.3.89-1
- Include scripts in the updates image (vponcova)
- Drop build time dependency on the anaconda package (mkolman)

2
sources
View File

@ -1 +1 @@
SHA512 (initial-setup-0.3.89.tar.gz) = bdb61b3e2fd51ae4470a77d20fdb907622eae607b1f0542c30eb453331682dd452a1e924dd61cb2bc9bf0ff2e986cb20957dd56be9805410a1785978001be252
SHA512 (initial-setup-0.3.90.tar.gz) = da89c1389554c1598544dc4e2d92f336916c8373a12889362a91bbae3bad0a2b095485787fe50e1bbda391e32d4224f0b129146daed723b1dc835f60265a4d55