From 1a42984490b5810f333a5c94b92e31d18636b02c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Aug 2016 17:27:08 -0500 Subject: [PATCH] revert Use size=10 by default (walters@verbum.org) Signed-off-by: Dennis Gilmore --- ...unning-fuser-on-dev-shm-also-run-ls-.patch | 2 +- ...the-mountpoints-that-fail-to-unmount.patch | 2 +- 0003-Revert-Use-size-10-by-default.patch | 28 +++++++++++++++++++ lorax.spec | 6 +++- 4 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 0003-Revert-Use-size-10-by-default.patch diff --git a/0001-in-additoon-to-running-fuser-on-dev-shm-also-run-ls-.patch b/0001-in-additoon-to-running-fuser-on-dev-shm-also-run-ls-.patch index 9651e5d..2c7a7f9 100644 --- a/0001-in-additoon-to-running-fuser-on-dev-shm-also-run-ls-.patch +++ b/0001-in-additoon-to-running-fuser-on-dev-shm-also-run-ls-.patch @@ -1,7 +1,7 @@ From 893c2b59b01bac9ab8ef6764ed4b33f353a4d745 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 18 Aug 2016 16:31:34 -0500 -Subject: [PATCH 1/2] in additoon to running fuser on /dev/shm also run ls to +Subject: [PATCH 1/3] in additoon to running fuser on /dev/shm also run ls to see whats in it Signed-off-by: Dennis Gilmore diff --git a/0002-run-lsof-on-the-mountpoints-that-fail-to-unmount.patch b/0002-run-lsof-on-the-mountpoints-that-fail-to-unmount.patch index 9968e04..9db7a03 100644 --- a/0002-run-lsof-on-the-mountpoints-that-fail-to-unmount.patch +++ b/0002-run-lsof-on-the-mountpoints-that-fail-to-unmount.patch @@ -1,7 +1,7 @@ From 4428f16c9501c32d8ad159492bf728791d8d364a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Aug 2016 09:13:57 -0500 -Subject: [PATCH 2/2] run lsof on the mountpoints that fail to unmount +Subject: [PATCH 2/3] run lsof on the mountpoints that fail to unmount Signed-off-by: Dennis Gilmore --- diff --git a/0003-Revert-Use-size-10-by-default.patch b/0003-Revert-Use-size-10-by-default.patch new file mode 100644 index 0000000..473a5cb --- /dev/null +++ b/0003-Revert-Use-size-10-by-default.patch @@ -0,0 +1,28 @@ +From 9b6a262b7cbe6f7a54ed80ea43266e7d10a6be0c Mon Sep 17 00:00:00 2001 +From: Dennis Gilmore +Date: Fri, 19 Aug 2016 17:24:16 -0500 +Subject: [PATCH 3/3] Revert "Use size=10 by default" + +since this landed in rawhide composing has been broken on arm + +This reverts commit e61223d486738c97369a98f81da7abd528c1cabf. +--- + src/pylorax/__init__.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/pylorax/__init__.py b/src/pylorax/__init__.py +index f6955c4..aafd0c9 100644 +--- a/src/pylorax/__init__.py ++++ b/src/pylorax/__init__.py +@@ -166,7 +166,7 @@ class Lorax(BaseLoraxClass): + isfinal=False, workdir=None, outputdir=None, buildarch=None, volid=None, + domacboot=True, doupgrade=True, remove_temp=False, + installpkgs=None, +- size=10, ++ size=2, + add_templates=None, + add_template_vars=None, + add_arch_templates=None, +-- +2.7.4 + diff --git a/lorax.spec b/lorax.spec index dbb1e89..fe24fe4 100644 --- a/lorax.spec +++ b/lorax.spec @@ -4,7 +4,7 @@ Name: lorax Version: 25.13 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Tool for creating the anaconda install images Group: Applications/System @@ -17,6 +17,7 @@ URL: https://github.com/rhinstaller/lorax Source0: %{name}-%{version}.tar.gz Patch0: 0001-in-additoon-to-running-fuser-on-dev-shm-also-run-ls-.patch Patch1: 0002-run-lsof-on-the-mountpoints-that-fail-to-unmount.patch +Patch2: 0003-Revert-Use-size-10-by-default.patch BuildRequires: python3-devel @@ -152,6 +153,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install %changelog +* Fri Aug 19 2016 Dennis Gilmore - 25.13-5 +- revert Use size=10 by default (walters@verbum.org) + * Fri Aug 19 2016 Dennis Gilmore - 25.13-4 - acctually apply the lsof patch