From 8249460acfc0ab7298d125b4ea29c72729a4582b Mon Sep 17 00:00:00 2001 From: Richard Jones Date: Thu, 13 Aug 2009 20:45:06 +0100 Subject: [PATCH] guestfish: Add --selinux option. --- fish/fish.c | 9 +++++++-- guestfish.pod | 10 +++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/fish/fish.c b/fish/fish.c index f245de1..f31f4ad 100644 --- a/fish/fish.c +++ b/fish/fish.c @@ -117,6 +117,7 @@ usage (void) " -n|--no-sync Don't autosync\n" " --remote[=pid] Send commands to remote guestfish\n" " -r|--ro Mount read-only\n" + " --selinux Enable SELinux support\n" " -v|--verbose Verbose messages\n" " -x Echo each command before executing it\n" " -V|--version Display version and exit\n" @@ -139,6 +140,7 @@ main (int argc, char *argv[]) { "no-sync", 0, 0, 'n' }, { "remote", 2, 0, 0 }, { "ro", 0, 0, 'r' }, + { "selinux", 0, 0, 0 }, { "verbose", 0, 0, 'v' }, { "version", 0, 0, 'V' }, { 0, 0, 0, 0 } @@ -205,6 +207,8 @@ main (int argc, char *argv[]) exit (1); } } + } else if (strcmp (long_options[option_index].name, "selinux") == 0) { + guestfs_set_selinux (g, 1); } else { fprintf (stderr, _("guestfish: unknown long option: %s (%d)\n"), long_options[option_index].name, option_index); @@ -306,8 +310,9 @@ main (int argc, char *argv[]) char cmd[1024]; int r; - if (drvs || mps || remote_control_listen || remote_control) { - fprintf (stderr, _("guestfish: cannot use -i option with -a, -m, --listen or --remote\n")); + if (drvs || mps || remote_control_listen || remote_control || + guestfs_get_selinux (g)) { + fprintf (stderr, _("guestfish: cannot use -i option with -a, -m, --listen, --remote or --selinux\n")); exit (1); } if (optind >= argc) { diff --git a/guestfish.pod b/guestfish.pod index f2255f1..5427b23 100644 --- a/guestfish.pod +++ b/guestfish.pod @@ -130,9 +130,9 @@ Typical usage is either: guestfish -i /dev/Guests/MyGuest -You cannot use I<-a>, I<-m>, I<--listen> or I<--remote> in conjunction -with this option, and options other than I<--ro> might not behave -correctly. +You cannot use I<-a>, I<-m>, I<--listen>, I<--remote> or I<--selinux> +in conjunction with this option, and options other than I<--ro> might +not behave correctly. See also: L. @@ -167,6 +167,10 @@ I below. This changes the C<-m> option so that mounts are done read-only (see C in the L manpage). +=item B<--selinux> + +Enable SELinux support for the guest. See L. + =item B<-v> | B<--verbose> Enable very verbose messages. This is particularly useful if you find -- 1.8.3.1