Ovirt devel - Mar 2009 - [PATCH server] reword selinux disable/permissive prompt

Rewords the selinux prompt to permissive rather than disable

---
 installer/bin/ovirt-installer |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/installer/bin/ovirt-installer b/installer/bin/ovirt-installer
index cb0bf15..8201d01 100755
--- a/installer/bin/ovirt-installer
+++ b/installer/bin/ovirt-installer
@@ -91,12 +91,12 @@ end
 if File.exist?("/usr/sbin/selinuxenabled")
     sestatus = system "/usr/sbin/selinuxenabled"
     if sestatus == true
-        selinux_disable = prompt_yes_no("SELinux enabled, would you like
to disable it?", :default => "y")
-        if selinux_disable == "n"
-            @cli.say("Please disable selinux prior to running the
installer again")
+        selinux_permissive = prompt_yes_no("SELinux enforing, would you
like to set it permissive?", :default => "y")
+        if selinux_permissive == "n"
+            @cli.say("SELinux must be permissive or disabled prior to
running the installer again")
             exit(0)
         else
-            @cli.say("Disabling SELinux")
+            @cli.say("Setting SELinux permissive")
             system "/usr/sbin/lokkit --selinux=permissive"
             system "/usr/sbin/setenforce 0"
         end
-- 
1.6.0.6

Joey Boggs wrote:
> Rewords the selinux prompt to permissive rather than disable
>
> ---
>  installer/bin/ovirt-installer |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/installer/bin/ovirt-installer b/installer/bin/ovirt-installer
> index cb0bf15..8201d01 100755
> --- a/installer/bin/ovirt-installer
> +++ b/installer/bin/ovirt-installer
> @@ -91,12 +91,12 @@ end
>  if File.exist?("/usr/sbin/selinuxenabled")
>      sestatus = system "/usr/sbin/selinuxenabled"
>      if sestatus == true
> -        selinux_disable = prompt_yes_no("SELinux enabled, would you
like to disable it?", :default => "y")
> -        if selinux_disable == "n"
> -            @cli.say("Please disable selinux prior to running the
installer again")
> +        selinux_permissive = prompt_yes_no("SELinux enforing, would
you like to set it permissive?", :default => "y")
> +        if selinux_permissive == "n"
> +            @cli.say("SELinux must be permissive or disabled prior to
running the installer again")
>              exit(0)
>          else
> -            @cli.say("Disabling SELinux")
> +            @cli.say("Setting SELinux permissive")
>              system "/usr/sbin/lokkit --selinux=permissive"
>              system "/usr/sbin/setenforce 0"
>          end
>   
ACK.

no functional changes here, but the wording is now correct.

Scott

Joey Boggs wrote:
> Rewords the selinux prompt to permissive rather than disable
>
> ---
>  installer/bin/ovirt-installer |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/installer/bin/ovirt-installer b/installer/bin/ovirt-installer
> index cb0bf15..8201d01 100755
> --- a/installer/bin/ovirt-installer
> +++ b/installer/bin/ovirt-installer
> @@ -91,12 +91,12 @@ end
>  if File.exist?("/usr/sbin/selinuxenabled")
>      sestatus = system "/usr/sbin/selinuxenabled"
>      if sestatus == true
> -        selinux_disable = prompt_yes_no("SELinux enabled, would you
like to disable it?", :default => "y")
> -        if selinux_disable == "n"
> -            @cli.say("Please disable selinux prior to running the
installer again")
> +        selinux_permissive = prompt_yes_no("SELinux enforing, would
you like to set it permissive?", :default => "y")
> +        if selinux_permissive == "n"
> +            @cli.say("SELinux must be permissive or disabled prior to
running the installer again")
>              exit(0)
>          else
> -            @cli.say("Disabling SELinux")
> +            @cli.say("Setting SELinux permissive")
>              system "/usr/sbin/lokkit --selinux=permissive"
>              system "/usr/sbin/setenforce 0"
>          end
>   
pushed