Add setfiles debug info for SELinux relabel

Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>

.gitignore

@@ -16,5 +16,3 @@
 /livecd-tools-25.0.tar.gz
 /livecd-tools-26.0.tar.gz
 /livecd-tools-26.1.tar.gz
-/livecd-tools-27.0.tar.gz
-/livecd-tools-27.1.tar.gz

debug-setfiles.patch

@@ -0,0 +1,28 @@
+diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py
+index 32d26b2..94a31a1 100644
+--- a/imgcreate/kickstart.py
++++ b/imgcreate/kickstart.py
+@@ -479,10 +479,19 @@ class SelinuxConfig(KickstartConfig):
+             return
+ 
+         try:
+-            rc = subprocess.call(['setfiles', '-p', '-e', '/proc',
+-                                  '-e', '/sys', '-e', '/dev',
+-                                  selinux.selinux_file_context_path(), '/'],
+-                                 preexec_fn=self.chroot)
++           cmd = ['setfiles', '-p', '-e', '/proc',
++                  '-e', '/sys', '-e', '/dev',
++                  selinux.selinux_file_context_path(), '/']
++           proc  = subprocess.Popen(cmd,
++                                    preexec_fn=self.chroot,
++                                    stdout=subprocess.PIPE,
++                                    stderr=subprocess.PIPE)
++           outs, errs = proc.communicate()
++           rc = proc.returncode
++           logging.info("setfiles command: {0}".format(cmd))
++           logging.info("setfiles returncode: {0}".format(rc))
++           logging.info("setfiles stdout: {0}".format(outs))
++           logging.info("setfiles stderr: {0}".format(errs))
+         except OSError as e:
+             if e.errno == errno.ENOENT:
+                 logging.info('The setfiles command is not available.')

livecd-tools.spec

@@ -16,14 +16,14 @@
 
 Summary: Tools for building live CDs
 Name: livecd-tools
-Version: 27.1
-Release: 6%{?dist}
-%if 0%{?fedora}
+Version: 26.1
+Release: 1.davidlt.0%{?dist}
 Epoch: 1
-%endif
 License: GPLv2
+Group: System Environment/Base
 URL: https://github.com/livecd-tools/livecd-tools
 Source0: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.gz
+Patch0: debug-setfiles.patch
 
 %if %{with python2}
 BuildRequires: python2-devel
@@ -34,16 +34,16 @@ BuildRequires: python3-devel
 BuildRequires: /usr/bin/pod2man
 
 %if %{with python3}
-Requires: python3-imgcreate = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: python3-imgcreate = %{epoch}:%{version}-%{release}
 %else
-Requires: python2-imgcreate = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: python2-imgcreate = %{epoch}:%{version}-%{release}
 %endif
 
 # For splitting out livecd-iso-to-disk to separate subpackage
 Conflicts: livecd-tools < 25.0
 
 %ifarch %{ix86} x86_64
-Requires: livecd-iso-to-mediums = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: livecd-iso-to-mediums = %{epoch}:%{version}-%{release}
 %endif
 
 %description
@@ -53,6 +53,7 @@ http://fedoraproject.org/wiki/FedoraLiveCD for more details.
 
 %package -n python-imgcreate-sysdeps
 Summary: Common system dependencies for python-imgcreate
+Group: System Environment/Base
 Requires: coreutils
 Requires: xorriso >= 1.4.8
 Requires: isomd5sum
@@ -94,7 +95,7 @@ Requires: selinux-policy-targeted
 Requires: dracut
 
 %if ! %{with python2}
-Obsoletes: python2-imgcreate < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: python2-imgcreate < %{epoch}:%{version}-%{release}
 %endif
 
 %description -n python-imgcreate-sysdeps
@@ -104,8 +105,9 @@ python-imgcreate.
 %if %{with python2}
 %package -n python2-imgcreate
 Summary: Python 2 modules for building system images
+Group: System Environment/Base
 %{?python_provide:%python_provide python2-imgcreate}
-Requires: python-imgcreate-sysdeps%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: python-imgcreate-sysdeps%{?_isa} = %{epoch}:%{version}-%{release}
 Requires: python2-dnf >= 1.1.0
 %if 0%{?rhel} && 0%{?rhel} < 8
 Requires: pyparted
@@ -129,8 +131,9 @@ like live image or appliances.
 %if %{with python3}
 %package -n python3-imgcreate
 Summary: Python 3 modules for building system images
+Group: System Environment/Base
 %{?python_provide:%python_provide python3-imgcreate}
-Requires: python-imgcreate-sysdeps%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: python-imgcreate-sysdeps%{?_isa} = %{epoch}:%{version}-%{release}
 Requires: python3-pyparted
 Requires: python3-dnf >= 1.1.0
 Requires: python3-kickstart
@@ -146,7 +149,8 @@ like live image or appliances.
 %ifarch %{ix86} x86_64
 %package -n livecd-iso-to-mediums
 Summary: Tools for installing ISOs to different mediums
-Requires: python-imgcreate-sysdeps%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+Group: System Environment/Base
+Requires: python-imgcreate-sysdeps%{?_isa} = %{epoch}:%{version}-%{release}
 Conflicts: livecd-tools < 25.0
 
 %description -n livecd-iso-to-mediums
@@ -219,52 +223,6 @@ rm -rfv %{buildroot}%{_mandir}/man8/livecd-iso-to-*
 %endif
 
 %changelog
-* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 1:27.1-6
-- Rebuilt for Python 3.9
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:27.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1:27.1-4
-- Rebuilt for Python 3.8.0rc1 (#1748018)
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 1:27.1-3
-- Rebuilt for Python 3.8
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:27.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Apr 19 2019 Neal Gompa <ngompa13@gmail.com> - 1:27.1-1
-- Bump version to 27.1 (ngompa13)
-- Fix Kernel version detection (pablo)
-
-* Sun Apr 14 2019 Neal Gompa <ngompa13@gmail.com> - 1:27.0-1
-- Bump version to 27.0 (ngompa13)
-- imgcreate/creator: Change to text strings for reading file list from rpm
-  (ngompa13)
-- imgcreate/live: Check for dracut being installed to determine usability
-  (ngompa13)
-- imgcreate/live: Add squashfs as a mandatory extra filesystem (ngompa13)
-- imgcreate/live: Rename dracut config file to 99-liveos.conf (ngompa13)
-- 'udevadm settle' needs some time to settle (sbonds)
-- README: Removed unnecessary 'the' (scwicker)
-- imgcreate/kickstart: Use systemctl for enabling/disabling services (ngompa13)
-- livecd-iso-to-disk: Simply mount read-only to test for flat_squashfs.
-  (fgrose)
-- editliveos: Accommodate netinstall in multi boot configuration files.
-  (fgrose)
-- livecd-iso-to-disk+pod: Support netinstall .isos and as multi install.
-  (fgrose)
-
-* Fri Apr 12 2019 Neal Gompa <ngompa13@gmail.com> - 1:26.1-4
-- Add patch to adapt to rpm Python bindings changing from bytes to strings (RH#1699432)
-
-* Thu Apr 04 2019 Neal Gompa <ngompa13@gmail.com> - 1:26.1-3
-- Backport fix from upstream to use systemctl instead of chkconfig (RH#1696064)
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:26.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
 * Sat Dec 08 2018 Neal Gompa <ngompa13@gmail.com> - 1:26.1-1
 - Bump version to 26.1 (ngompa13)
 - Run setfiles after chroot (noto.kazufumi)

sources

@@ -1 +1 @@
-SHA512 (livecd-tools-27.1.tar.gz) = f5a744248d04b89e930e35fd52917412c6e97a800c4da6f9064a74a1bd7fd37bcc64eb38c222018d7e4fcb0686ede79ac4f3db5ea2b70fb7d062e79b441a2bd1
+SHA512 (livecd-tools-26.1.tar.gz) = 240c13ec615b7c181227ad4223743f8221b27025184124001274d92c3a92c01755bf17fd91e86c5844535dc4e09387da1e2952faa004929d74a077850db9e8a6