From 9ec8f156cfe98831c5e7140fd54e311f2a2afd4f Mon Sep 17 00:00:00 2001 From: Jon Griffiths Date: Sun, 27 Mar 2016 04:25:55 +1300 Subject: [PATCH] lorax: Don't delete os-release directories Doing so prevents the install .iso from booting. First identified under https://bugzilla.redhat.com/show_bug.cgi?id=1191713 and a second fix was put in at https://github.com/rhinstaller/lorax/pull/6/commits/c0b10633977625e3692397fa428a39d40aeb7772 (this patch includes both changes). --- lorax/0002_backport_os_release_deletion_fix.patch | 13 +++++++++++++ lorax/lorax.spec | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 lorax/0002_backport_os_release_deletion_fix.patch diff --git a/lorax/0002_backport_os_release_deletion_fix.patch b/lorax/0002_backport_os_release_deletion_fix.patch new file mode 100644 index 0000000..b67e2ed --- /dev/null +++ b/lorax/0002_backport_os_release_deletion_fix.patch @@ -0,0 +1,13 @@ +diff -ur lorax-22.1/share/runtime-cleanup.tmpl lorax-22.1-patch/share/runtime-cleanup.tmpl +--- lorax-22.1/share/runtime-cleanup.tmpl 2014-12-13 11:20:56.000000000 +1300 ++++ lorax-22.1-patch/share/runtime-cleanup.tmpl 2016-03-27 04:21:37.534000000 +1300 +@@ -27,7 +27,8 @@ + ## we don't run SELinux (not in enforcing, anyway) + removepkg checkpolicy selinux-policy libselinux-utils + ## anaconda has its own repo files +-removefrom fedora-release --allbut /etc/os-release ++removefrom fedora-release --allbut /etc/os-release /usr/lib/os-release \ ++ /usr/lib/os.release.d/* + removepkg fedora-release-rawhide + ## no user accounts = no account management + removepkg usermode usermode-gtk passwd shadow-utils diff --git a/lorax/lorax.spec b/lorax/lorax.spec index afbc59b..a362f89 100644 --- a/lorax/lorax.spec +++ b/lorax/lorax.spec @@ -17,6 +17,7 @@ License: GPLv2+ URL: http://git.fedorahosted.org/git/?p=lorax.git Source0: https://fedorahosted.org/releases/l/o/%{name}/%{name}-%{version}.tar.gz Patch0: 0001_pass_kernel_version_as_an_arg.patch +Patch1: 0002_backport_os_release_deletion_fix.patch BuildRequires: python2-devel Requires: GConf2 @@ -86,6 +87,7 @@ Anaconda's image install feature. %setup -q %patch0 -p1 +%patch1 -p1 %build %install