Fabian Deutsch has uploaded a new change for review. Change subject: init: Move on-boot hooks to a reachable place ......................................................................
init: Move on-boot hooks to a reachable place Previously the on-boot hooks were moved to a place which was never reached, now the hooks are called in a passage that is beeing reached. Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1206139 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1194068 Change-Id: Ie9e9b6d4bfddeb91917a74ed27e297cea7e31099 Signed-off-by: Fabian Deutsch <[email protected]> --- M scripts/ovirt-init-functions.sh.in 1 file changed, 11 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/64/39264/1 diff --git a/scripts/ovirt-init-functions.sh.in b/scripts/ovirt-init-functions.sh.in index fbab8de..cb3d955 100644 --- a/scripts/ovirt-init-functions.sh.in +++ b/scripts/ovirt-init-functions.sh.in @@ -1474,6 +1474,17 @@ rm /var/lock/subsys/network fi + # Run on-boot hooks + if [[ -d "$HOOK_ON_BOOT_DIR" ]] && [[ "$(ls -A $HOOK_ON_BOOT_DIR)" ]]; + then + for handler in "$HOOK_ON_BOOT_DIR"/*; + do + log "Running handler: $handler" + "$handler" >> $OVIRT_LOGFILE 2>&1 + done + fi + + # FIXME is this still needed? if is_standalone; then return 0 fi @@ -1508,15 +1519,6 @@ # perform any post startup operations case $OVIRT_RUNTIME_MODE in esac - - if [[ -d "$HOOK_ON_BOOT_DIR" ]] && [[ "$(ls -A $HOOK_ON_BOOT_DIR)" ]]; - then - for handler in "$HOOK_ON_BOOT_DIR"/*; - do - log "Running handler: $handler" - "$handler" >> $OVIRT_LOGFILE 2>&1 - done - fi rm -f $VAR_SUBSYS_OVIRT_POST -- To view, visit https://gerrit.ovirt.org/39264 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie9e9b6d4bfddeb91917a74ed27e297cea7e31099 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-node Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Fabian Deutsch <[email protected]> Gerrit-Reviewer: Fabian Deutsch <[email protected]> _______________________________________________ node-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/node-patches
