[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[PATCH f15-branch, master] Attempt at fixing reboot behavior in kickstart (#676968).



I think that rebooting is accomplished by not specifying halt or reboot,
so don't specify either of those.
---
 loader/kickstart.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/loader/kickstart.c b/loader/kickstart.c
index 06804f8..b816b35 100644
--- a/loader/kickstart.c
+++ b/loader/kickstart.c
@@ -544,6 +544,7 @@ static void setSELinux(struct loaderData_s * loaderData, PyObject *handler) {
 }
 
 static void setShutdown(struct loaderData_s * loaderData, PyObject *handler) {
+    PyObject *rebootObj = getObject(constantsMod, "KS_REBOOT", 0);
     PyObject *shutdownObj = getObject(constantsMod, "KS_SHUTDOWN", 0);
     PyObject *settingObj = getattr(handler, "reboot", "action");
 
@@ -555,11 +556,12 @@ static void setShutdown(struct loaderData_s * loaderData, PyObject *handler) {
     else {
         if (settingObj == shutdownObj)
             flags |= LOADER_FLAGS_POWEROFF;
-        else
+        else if (settingObj != rebootObj)
             flags |= LOADER_FLAGS_HALT;
     }
 
 cleanup:
+    Py_XDECREF(rebootObj);
     Py_XDECREF(shutdownObj);
     Py_XDECREF(settingObj);
 }
-- 
1.7.1.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]