[Ovirt-devel] [PATCH] ovirt-awake improvements

[Darryl L. Pierce]

On Tue, Mar 16, 2010 at 05:46:12PM +0100, Arthur CLEMENT wrote:
> >From 1ca6e713d0c23279a6800e6dfb4a76ab4250f56f Mon Sep 17 00:00:00 2001
> From: Arthur CLEMENT <aclement at linagora.com>
> Date: Tue, 16 Mar 2010 16:36:50 +0000
> Subject: [PATCH] Function typo fixed. Move the sourcing of NODE_CONFIG
> forward to not override the $OVIRT_RUNTIME_MODE read from karg
> 
> Signed-off-by: Arthur CLEMENT <aclement at linagora.com>
> ---
>  scripts/ovirt-awake |    7 +++++--
>  1 files changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/scripts/ovirt-awake b/scripts/ovirt-awake
> index d5865c5..5126a54 100755
> --- a/scripts/ovirt-awake
> +++ b/scripts/ovirt-awake
> @@ -22,6 +22,7 @@
>  #
>  ### BEGIN INIT INFO
>  # Provides: ovirt-awake
> +# Required-Start: ovirt-early

This is already provided by a different patch and will cause a
collision.

>  # Default-Start: 2 3 4 5
>  # Description: Managed node service to alert management servers.
>  ### END INIT INFO
> @@ -30,7 +31,6 @@
>  # config: /etc/sysconfig/node-config
> 
>  . /etc/init.d/functions
> -. /usr/libexec/ovirt-functions
> 
>  prog=ovirt-awake
>  NODE_CONFIG=/etc/sysconfig/node-config
> @@ -39,6 +39,8 @@ VAR_SUBSYS_NODECONFIG=/var/lock/subsys/node-config
>  # load the configuration file
>  [ -f "$NODE_CONFIG" ] && . "$NODE_CONFIG"
> 
> +. /usr/libexec/ovirt-functions
> +
>  send_text () {
>      local text=${1}
> 
> @@ -113,6 +115,7 @@ start_ovirt_awake () {
>              log "Node is operating in unmanaged mode."
>              ;;
>          "ovirt")
> +            log "Node is operating in ovirt mode."
>              ovirt_startup
>              RC=$?
>              ;;
> @@ -146,7 +149,7 @@ case "$1" in
>          echo -n "Starting ovirt-awake: "
>          [ -f "$VAR_SUBSYS_NODECONFIG" ] && exit 0
>          {
> -            start
> +            start_ovirt_awake
>              RETVAL=$?
>              log "Completed ovirt-awake: RETVAL=$?"
>          } >> $OVIRT_LOGFILE 2>&1
> -- 
> 1.6.6.1
> 
> 
> _______________________________________________
> Ovirt-devel mailing list
> Ovirt-devel at redhat.com
> https://www.redhat.com/mailman/listinfo/ovirt-devel

Other than the one comment, ACK. I'll modify it and push the patch out
today along with the previous related patch.

-- 
Darryl L. Pierce, Sr. Software Engineer @ Red Hat, Inc.
Delivering value year after year.
Red Hat ranks #1 in value among software vendors.
http://www.redhat.com/promo/vendor/

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/ovirt-devel/attachments/20100316/db2ccf46/attachment.sig>