[Ovirt-devel] [PATCH] block setup from running in rescue mode

[Joey Boggs]

rhbz#683328

Signed-off-by: Joey Boggs <jboggs at redhat.com>
---
 scripts/ovirt-config-setup.py |    5 ++++-
 scripts/ovirtfunctions.py     |   11 +++++++++++
 2 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/scripts/ovirt-config-setup.py b/scripts/ovirt-config-setup.py
index a8f85cf..77669d4 100755
--- a/scripts/ovirt-config-setup.py
+++ b/scripts/ovirt-config-setup.py
@@ -1603,7 +1603,10 @@ class NodeConfigScreen():
                 self.restore_console_colors()
 
 if __name__ == "__main__":
-    if is_booted_from_local_disk() or "--force" in sys.argv:
+    if is_rescue_mode():
+        print "Unable to run setup in rescue mode"
+        sys.exit(1)
+    elif is_booted_from_local_disk() or "--force" in sys.argv:
         screen = NodeConfigScreen()
         screen.start()
     else:
diff --git a/scripts/ovirtfunctions.py b/scripts/ovirtfunctions.py
index 2d6fac4..dbcad14 100644
--- a/scripts/ovirtfunctions.py
+++ b/scripts/ovirtfunctions.py
@@ -192,6 +192,17 @@ def is_booted_from_local_disk():
     else:
         return False
 
+def is_rescue_mode():
+    ret = os.system("grep -q rescue /proc/cmdline")
+    if ret == 0:
+        return True
+    # check for runlevel 1
+    else:
+        ret = os.system("runlevel|grep 1")
+        if ret == 0:
+            return True
+        return False
+
 # was firstboot menu already shown?
 # state is stored in persistent config partition
 def is_firstboot():
-- 
1.7.5.4