From c8fcafc3001fcbdafbc0af2952ab1f12d90d9efd Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 28 Jul 2020 19:14:28 +0000 Subject: [PATCH] import initial-setup-0.3.81.6-1.el8 --- .gitignore | 2 +- .initial-setup.metadata | 2 +- SPECS/initial-setup.spec | 59 +++------------------------------------- 3 files changed, 6 insertions(+), 57 deletions(-) diff --git a/.gitignore b/.gitignore index 1a0fa38..7b4a8f7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/initial-setup-0.3.81.5.tar.gz +SOURCES/initial-setup-0.3.81.6.tar.gz diff --git a/.initial-setup.metadata b/.initial-setup.metadata index 07066f8..29e88c6 100644 --- a/.initial-setup.metadata +++ b/.initial-setup.metadata @@ -1 +1 @@ -98caebd7153a2c2fefcdd1f9f61aef07393153e9 SOURCES/initial-setup-0.3.81.5.tar.gz +85c539a531f7702d6e7ddacb8f0c5100c1d86313 SOURCES/initial-setup-0.3.81.6.tar.gz diff --git a/SPECS/initial-setup.spec b/SPECS/initial-setup.spec index aa47f12..3b3097e 100644 --- a/SPECS/initial-setup.spec +++ b/SPECS/initial-setup.spec @@ -1,7 +1,7 @@ Summary: Initial system configuration utility Name: initial-setup URL: https://fedoraproject.org/wiki/InitialSetup -Version: 0.3.81.5 +Version: 0.3.81.6 Release: 1%{?dist} # This is a Red Hat maintained package which is specific to @@ -78,33 +78,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 @@ -114,33 +87,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 %license COPYING @@ -166,6 +112,9 @@ fi %{python3_sitelib}/initial_setup/gui/* %changelog +* Fri Jul 17 2020 Martin Kolman - 0.3.81.6-1 +- Remove old failing pre scriptlet (mkolman) + * Thu Jun 25 2020 Martin Kolman - 0.3.81.5-1 - Disable multi TTY handler when running in SSH session (mkolman) - Add CLI option to disable multi TTY handler (mkolman)