Fabian Deutsch has uploaded a new change for review. Change subject: lib: Solve conflicting names ......................................................................
lib: Solve conflicting names Due to a name conflict (import system from ovirt.node.utils and the function itself) the keyboard config couldn't be loaded during boot. This is now solved by fixing the import. Change-Id: I5e92b5b3ffd44973c1bd085accfcc93933caf318 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1000867 Signed-off-by: Fabian Deutsch <[email protected]> --- M scripts/ovirt-init-functions.sh.in M src/ovirtnode/ovirtfunctions.py 2 files changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/59/18759/1 diff --git a/scripts/ovirt-init-functions.sh.in b/scripts/ovirt-init-functions.sh.in index e57dea8..9b03785 100644 --- a/scripts/ovirt-init-functions.sh.in +++ b/scripts/ovirt-init-functions.sh.in @@ -1284,7 +1284,7 @@ rm -rf ${logsync_TMPDIR} # Re-load keyboard settings - load_keyboard_config 2> /dev/null + load_keyboard_config # Rewrite resolv.conf, rhbz#742365 configure_dns diff --git a/src/ovirtnode/ovirtfunctions.py b/src/ovirtnode/ovirtfunctions.py index a7e697d..0be08e1 100644 --- a/src/ovirtnode/ovirtfunctions.py +++ b/src/ovirtnode/ovirtfunctions.py @@ -38,7 +38,8 @@ import grp import pwd from ovirt.node.config import defaults -from ovirt.node.utils import process,system +from ovirt.node.utils import process +import ovirt.node.utils.system as osystem OVIRT_CONFIG="/config" OVIRT_LOGFILE="/var/log/ovirt.log" @@ -1685,7 +1686,7 @@ return True def load_keyboard_config(): - kbd = system.Keyboard() + kbd = osystem.Keyboard() kbd.reactivate() def is_engine_configured(): -- To view, visit http://gerrit.ovirt.org/18759 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5e92b5b3ffd44973c1bd085accfcc93933caf318 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-node Gerrit-Branch: master Gerrit-Owner: Fabian Deutsch <[email protected]> _______________________________________________ node-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/node-patches
