[Libguestfs] [libguestfs-common PATCH 2/2] remove non-generated "--selinux-relabel" options

Two test cases pass "--selinux-relabel" explicitly. Remove this (now obsolete / default) option. Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1554735 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2075718 Signed-off-by: Laszlo Ersek <lersek(a)redhat.com&gt; --- mlcustomize/test-firstboot.sh | 3 --- mlcustomize/test-selinuxrelabel.sh | 5 ++--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/mlcustomize/test-firstboot.sh b/mlcustomize/test-firstboot.sh index b906997515db..24c67f3e1339 100755 --- a/mlcustomize/test-firstboot.sh +++ b/mlcustomize/test-firstboot.sh @@ -61,9 +61,6 @@ case "$guestname" in extra[${#extra[*]}]='/etc/inittab: s,^#([1-9].*respawn.*/sbin/getty.*),$1,' ;; - fedora*|rhel*|centos*) - extra[${#extra[*]}]='--selinux-relabel' - ;; *) ;; esac diff --git a/mlcustomize/test-selinuxrelabel.sh b/mlcustomize/test-selinuxrelabel.sh index 86278c63b200..caf75211346a 100755 --- a/mlcustomize/test-selinuxrelabel.sh +++ b/mlcustomize/test-selinuxrelabel.sh @@ -41,13 +41,12 @@ virt-builder "$guestname" --quiet -o "$disk" # Test #1: relabel with the default configuration works. rm -f "$disk_overlay" guestfish -- disk-create "$disk_overlay" qcow2 -1 backingfile:"$disk" -virt-customize -a "$disk" --selinux-relabel +virt-customize -a "$disk" # Test #2: relabel with no SELINUXTYPE in the configuration. rm -f "$disk_overlay" guestfish -- disk-create "$disk_overlay" qcow2 -1 backingfile:"$disk" virt-customize -a "$disk" \ - --edit /etc/selinux/config:"s,^SELINUXTYPE=,#&,g" \ - --selinux-relabel + --edit /etc/selinux/config:"s,^SELINUXTYPE=,#&,g" rm "$disk" "$disk_overlay" -- 2.19.1.3.g30247aa5d201