From b5e1d71590a7bb393599eb5daa9b3c927a6ea793 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Thu, 26 Nov 2015 17:25:55 +0100 Subject: [PATCH] Change the order of context.sh retrieval methods --- base/usr/sbin/one-contextd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/base/usr/sbin/one-contextd b/base/usr/sbin/one-contextd index ee1cb3e..716c94f 100755 --- a/base/usr/sbin/one-contextd +++ b/base/usr/sbin/one-contextd @@ -48,14 +48,14 @@ function start { execute_scripts umount /mnt + elif curl -o /tmp/context.sh http://169.254.169.254/latest/user-data ; then + export_rc_vars /tmp/context.sh + execute_scripts elif type vmtoolsd ; then vmtoolsd --cmd 'info-get guestinfo.opennebula.context' | \ openssl base64 -d > /tmp/context.sh export_rc_vars /tmp/context.sh execute_scripts - elif curl -o /tmp/context.sh http://169.254.169.254/latest/user-data ; then - export_rc_vars /tmp/context.sh - execute_scripts fi }