[node-patches] Change in ovirt-node[master]: Fixup incorrectly merged change

[fabiand at fedoraproject.org]

Fabian Deutsch has uploaded a new change for review.

Change subject: Fixup incorrectly merged change
......................................................................

Fixup incorrectly merged change

Change-Id: I01fb5f01222d359330ff583770a28e1213bd70f9
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
---
M scripts/ovirt-auto-install.py
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/18/29218/1

diff --git a/scripts/ovirt-auto-install.py b/scripts/ovirt-auto-install.py
index 8219784..287b7da 100755
--- a/scripts/ovirt-auto-install.py
+++ b/scripts/ovirt-auto-install.py
@@ -28,7 +28,7 @@
 from ovirt.node.utils import system
 from ovirt.node.utils import security, storage, hooks
 from ovirt.node.config import defaults
-from ovirt.node.utils.system import which
+from ovirt.node.utils.system import which, kernel_cmdline_arguments
 import logging
 import sys
 import os
@@ -264,7 +264,7 @@
     TransactionProgress(tx, is_dry=False).run()
     print "Installation and Configuration Completed"
 
-    reboot_delay = get_cmdline_args().get("reboot_delay", None)
+    reboot_delay = kernel_cmdline_arguments().get("reboot_delay", None)
     if reboot_delay:
         print "Reboot Scheduled in %s seconds later" % reboot_delay
         time.sleep(int(reboot_delay))


-- 
To view, visit http://gerrit.ovirt.org/29218
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I01fb5f01222d359330ff583770a28e1213bd70f9
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Fabian Deutsch <fabiand at fedoraproject.org>
Gerrit-Reviewer: Fabian Deutsch <fabiand at fedoraproject.org>