On Mon, Apr 03, 2023 at 12:00:38PM +0200, Laszlo Ersek wrote:
On 4/3/23 11:16, Richard W.M. Jones wrote:
SFDC case 03473932, RHEL 8 only.
See discussion in private email thread "Customer case requiring our assistance" in 2023. --- mlcustomize/SELinux_relabel.ml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/mlcustomize/SELinux_relabel.ml b/mlcustomize/SELinux_relabel.ml index 5ecf7bd..f0630db 100644 --- a/mlcustomize/SELinux_relabel.ml +++ b/mlcustomize/SELinux_relabel.ml @@ -35,11 +35,12 @@ let rec relabel (g : G.guestfs) = use_setfiles g; (* That worked, so we don't need to autorelabel. *) g#rm_f "/.autorelabel" - with Failure _ -> + with Failure _ (* This is the fallback in case something in the setfiles * method didn't work. That includes the case where a non-SELinux * host is processing an SELinux guest, and other things. *) + | Guestfs.Error _ -> (* this is for SFDC case 03473932 in RHEL 8 only *) g#touch "/.autorelabel" )
Will we create a new rhel-8.xxx branch (in the upstream repo of course) for this?
Yup, done as rhel-8.8.0. (Ideally it should have been something like rhel-v2v-8.8.0 in case we also want to make incompatible changes to libguestfs, but here we are.) Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-builder quickly builds VMs from scratch http://libguestfs.org/virt-builder.1.html