Skip to content

Commit 875128f

Browse files
committed
lib: Deprecate old SELinux APIs, rewrite SELinux documentation (RHBZ#1152825).
Also turns the --selinux option of guestfish, guestmount and virt-rescue into a no-op -- it didn't work before so this is effectively no change.
1 parent f5dbdcd commit 875128f

File tree

4 files changed

+0
-19
lines changed

4 files changed

+0
-19
lines changed

builder/builder.ml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -642,12 +642,6 @@ let main () =
642642
may g#set_smp cmdline.smp;
643643
g#set_network cmdline.network;
644644

645-
(* Make sure to turn SELinux off to avoid awkward interactions
646-
* between the appliance kernel and applications/libraries interacting
647-
* with SELinux xattrs.
648-
*)
649-
g#set_selinux false;
650-
651645
(* The output disk is being created, so use cache=unsafe here. *)
652646
g#add_drive_opts ~format:output_format ~cachemode:"unsafe" output_filename;
653647

customize/customize_main.ml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,6 @@ read the man page virt-customize(1).
162162
may g#set_memsize memsize;
163163
may g#set_smp smp;
164164
g#set_network network;
165-
(* Make sure to turn SELinux off to avoid awkward interactions
166-
* between the appliance kernel and applications/libraries interacting
167-
* with SELinux xattrs.
168-
*)
169-
g#set_selinux false;
170165

171166
(* Add disks. *)
172167
add g dryrun;

dib/dib.ml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -634,12 +634,6 @@ let main () =
634634
may g#set_smp cmdline.smp;
635635
g#set_network cmdline.network;
636636

637-
(* Make sure to turn SELinux off to avoid awkward interactions
638-
* between the appliance kernel and applications/libraries interacting
639-
* with SELinux xattrs.
640-
*)
641-
g#set_selinux false;
642-
643637
(* Main disk with the built image. *)
644638
let fmt = "raw" in
645639
let fn =

tests/selinux/run-test.pl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,6 @@
105105
# Create a filesystem that could support xattrs and SELinux labels.
106106
my $g = Sys::Guestfs->new ();
107107

108-
#$g->set_selinux (1) if $test_type eq "selinux";
109-
110108
$g->add_drive_scratch (256*1024*1024);
111109
$g->launch ();
112110

0 commit comments

Comments
 (0)