Return-Path: 
 <commits-return-46347-apmail-cloudstack-commits-archive=cloudstack.apache.org@cloudstack.apache.org>
X-Original-To: apmail-cloudstack-commits-archive@www.apache.org
Delivered-To: apmail-cloudstack-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id C27DC10154
	for <apmail-cloudstack-commits-archive@www.apache.org>;
 Fri, 21 Nov 2014 13:02:28 +0000 (UTC)
Received: (qmail 73657 invoked by uid 500); 21 Nov 2014 13:02:28 -0000
Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org
Received: (qmail 73623 invoked by uid 500); 21 Nov 2014 13:02:28 -0000
Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cloudstack.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cloudstack.apache.org>
List-Post: <mailto:commits@cloudstack.apache.org>
List-Id: <commits.cloudstack.apache.org>
Reply-To: dev@cloudstack.apache.org
Delivered-To: mailing list commits@cloudstack.apache.org
Received: (qmail 73606 invoked by uid 99); 21 Nov 2014 13:02:28 -0000
Received: from mail-relay.apache.org (HELO mail-relay.apache.org)
 (140.211.11.15)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Nov 2014 13:02:28 +0000
Received: from mail-wg0-f42.google.com (mail-wg0-f42.google.com
 [74.125.82.42])
	by mail-relay.apache.org (ASF Mail Server at mail-relay.apache.org) with
 ESMTPSA id A94951A03BB;
	Fri, 21 Nov 2014 13:02:23 +0000 (UTC)
Received: by mail-wg0-f42.google.com with SMTP id z12so6533850wgg.15
        for <multiple recipients>; Fri, 21 Nov 2014 05:02:25 -0800 (PST)
X-Received: by 10.180.78.73 with SMTP id z9mr25054959wiw.52.1416574945190;
 Fri, 21 Nov 2014 05:02:25 -0800 (PST)
MIME-Version: 1.0
Received: by 10.27.11.210 with HTTP; Fri, 21 Nov 2014 05:02:04 -0800 (PST)
In-Reply-To: <1da6bc78351646c8bdc41c402c55a36b@git.apache.org>
References: <1da6bc78351646c8bdc41c402c55a36b@git.apache.org>
From: Rohit Yadav <bhaisaab@apache.org>
Date: Fri, 21 Nov 2014 18:32:04 +0530
Message-ID: 
 <CANLSSBWXk-u=vh7NO2MDo5pTpPj5M9W9hTjf24G5_qPYiu+aJg@mail.gmail.com>
Subject: Re: git commit: updated refs/heads/4.5 to 50d756e
To: "dev@cloudstack.apache.org" <dev@cloudstack.apache.org>,
 Edison Su <edison.su@citrix.com>
Cc: commits@cloudstack.apache.org
Content-Type: multipart/alternative; boundary=f46d0438903b67ed6905085e0e80

--f46d0438903b67ed6905085e0e80
Content-Type: text/plain; charset=ISO-8859-1

Hi Edison,

On Fri, Nov 21, 2014 at 12:30 AM, <edison@apache.org> wrote:

> Repository: cloudstack
> Updated Branches:
>   refs/heads/4.5 1d6ca5eac -> 50d756e87
>
>
> Occasionally the while loop can exit with no data (Probably recieving an
> EOF) before receiveing CMDline data from the certial port. Continue looping
> until cmdline is populated
>

Should we port/cherry-pick/merge this to master as well?


>
> Signed-off-by: Edison Su <sudison@gmail.com>
>
>
> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
> Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/50d756e8
> Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/50d756e8
> Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/50d756e8
>
> Branch: refs/heads/4.5
> Commit: 50d756e87d26f0ac86e7897505ad2747735c4d5c
> Parents: 1d6ca5e
> Author: David Bierce <david.bierce@appcore.com>
> Authored: Fri Sep 12 10:52:29 2014 -0500
> Committer: Edison Su <sudison@gmail.com>
> Committed: Thu Nov 20 10:58:35 2014 -0800
>
> ----------------------------------------------------------------------
>  .../debian/config/etc/init.d/cloud-early-config | 22 +++++++++++---------
>  1 file changed, 12 insertions(+), 10 deletions(-)
> ----------------------------------------------------------------------
>
>
>
> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/50d756e8/systemvm/patches/debian/config/etc/init.d/cloud-early-config
> ----------------------------------------------------------------------
> diff --git a/systemvm/patches/debian/config/etc/init.d/cloud-early-config
> b/systemvm/patches/debian/config/etc/init.d/cloud-early-config
> index 11d0612..294ae5f 100755
> --- a/systemvm/patches/debian/config/etc/init.d/cloud-early-config
> +++ b/systemvm/patches/debian/config/etc/init.d/cloud-early-config
> @@ -117,16 +117,18 @@ get_boot_params() {
>            if [ ! -e /dev/vport0p1 ]; then
>              log_it "/dev/vport0p1 not loaded, perhaps guest kernel is too
> old." && exit 2
>            fi
> -          while read line; do
> -            if [[ $line == cmdline:* ]]; then
> -              cmd=${line//cmdline:/}
> -              echo $cmd > /var/cache/cloud/cmdline
> -            elif [[ $line == pubkey:* ]]; then
> -              pubkey=${line//pubkey:/}
> -              echo $pubkey > /var/cache/cloud/authorized_keys
> -              echo $pubkey > /root/.ssh/authorized_keys
> -            fi
> -          done < /dev/vport0p1
> +                 while [$cmd -eq ""]; do
> +            while read line; do
> +              if [[ $line == cmdline:* ]]; then
> +                cmd=${line//cmdline:/}
> +                echo $cmd > /var/cache/cloud/cmdline
> +              elif [[ $line == pubkey:* ]]; then
> +                pubkey=${line//pubkey:/}
> +                echo $pubkey > /var/cache/cloud/authorized_keys
> +                echo $pubkey > /root/.ssh/authorized_keys
> +              fi
> +            done < /dev/vport0p1
> +                 done
>            chmod go-rwx /root/.ssh/authorized_keys
>            ;;
>       vmware)
>
>

--f46d0438903b67ed6905085e0e80
Content-Type: text/html; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr">Hi Edison,<div class=3D"gmail_extra"><br><div class=3D"gma=
il_quote">On Fri, Nov 21, 2014 at 12:30 AM,  <span dir=3D"ltr">&lt;<a href=
=3D"mailto:edison@apache.org" target=3D"_blank">edison@apache.org</a>&gt;</=
span> wrote:<br><blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8e=
x;border-left:1px #ccc solid;padding-left:1ex">Repository: cloudstack<br>
Updated Branches:<br>
=A0 refs/heads/4.5 1d6ca5eac -&gt; 50d756e87<br>
<br>
<br>
Occasionally the while loop can exit with no data (Probably recieving an EO=
F) before receiveing CMDline data from the certial port. Continue looping u=
ntil cmdline is populated<br></blockquote><div><br></div><div>Should we por=
t/cherry-pick/merge this to master as well?</div><div>=A0</div><blockquote =
class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1px #ccc solid=
;padding-left:1ex">
<br>
Signed-off-by: Edison Su &lt;<a href=3D"mailto:sudison@gmail.com">sudison@g=
mail.com</a>&gt;<br>
<br>
<br>
Project: <a href=3D"http://git-wip-us.apache.org/repos/asf/cloudstack/repo"=
 target=3D"_blank">http://git-wip-us.apache.org/repos/asf/cloudstack/repo</=
a><br>
Commit: <a href=3D"http://git-wip-us.apache.org/repos/asf/cloudstack/commit=
/50d756e8" target=3D"_blank">http://git-wip-us.apache.org/repos/asf/cloudst=
ack/commit/50d756e8</a><br>
Tree: <a href=3D"http://git-wip-us.apache.org/repos/asf/cloudstack/tree/50d=
756e8" target=3D"_blank">http://git-wip-us.apache.org/repos/asf/cloudstack/=
tree/50d756e8</a><br>
Diff: <a href=3D"http://git-wip-us.apache.org/repos/asf/cloudstack/diff/50d=
756e8" target=3D"_blank">http://git-wip-us.apache.org/repos/asf/cloudstack/=
diff/50d756e8</a><br>
<br>
Branch: refs/heads/4.5<br>
Commit: 50d756e87d26f0ac86e7897505ad2747735c4d5c<br>
Parents: 1d6ca5e<br>
Author: David Bierce &lt;<a href=3D"mailto:david.bierce@appcore.com">david.=
bierce@appcore.com</a>&gt;<br>
Authored: Fri Sep 12 10:52:29 2014 -0500<br>
Committer: Edison Su &lt;<a href=3D"mailto:sudison@gmail.com">sudison@gmail=
.com</a>&gt;<br>
Committed: Thu Nov 20 10:58:35 2014 -0800<br>
<br>
----------------------------------------------------------------------<br>
=A0.../debian/config/etc/init.d/cloud-early-config | 22 +++++++++++--------=
-<br>
=A01 file changed, 12 insertions(+), 10 deletions(-)<br>
----------------------------------------------------------------------<br>
<br>
<br>
<a href=3D"http://git-wip-us.apache.org/repos/asf/cloudstack/blob/50d756e8/=
systemvm/patches/debian/config/etc/init.d/cloud-early-config" target=3D"_bl=
ank">http://git-wip-us.apache.org/repos/asf/cloudstack/blob/50d756e8/system=
vm/patches/debian/config/etc/init.d/cloud-early-config</a><br>
----------------------------------------------------------------------<br>
diff --git a/systemvm/patches/debian/config/etc/init.d/cloud-early-config b=
/systemvm/patches/debian/config/etc/init.d/cloud-early-config<br>
index 11d0612..294ae5f 100755<br>
--- a/systemvm/patches/debian/config/etc/init.d/cloud-early-config<br>
+++ b/systemvm/patches/debian/config/etc/init.d/cloud-early-config<br>
@@ -117,16 +117,18 @@ get_boot_params() {<br>
=A0 =A0 =A0 =A0 =A0 =A0if [ ! -e /dev/vport0p1 ]; then<br>
=A0 =A0 =A0 =A0 =A0 =A0 =A0log_it &quot;/dev/vport0p1 not loaded, perhaps g=
uest kernel is too old.&quot; &amp;&amp; exit 2<br>
=A0 =A0 =A0 =A0 =A0 =A0fi<br>
-=A0 =A0 =A0 =A0 =A0 while read line; do<br>
-=A0 =A0 =A0 =A0 =A0 =A0 if [[ $line =3D=3D cmdline:* ]]; then<br>
-=A0 =A0 =A0 =A0 =A0 =A0 =A0 cmd=3D${line//cmdline:/}<br>
-=A0 =A0 =A0 =A0 =A0 =A0 =A0 echo $cmd &gt; /var/cache/cloud/cmdline<br>
-=A0 =A0 =A0 =A0 =A0 =A0 elif [[ $line =3D=3D pubkey:* ]]; then<br>
-=A0 =A0 =A0 =A0 =A0 =A0 =A0 pubkey=3D${line//pubkey:/}<br>
-=A0 =A0 =A0 =A0 =A0 =A0 =A0 echo $pubkey &gt; /var/cache/cloud/authorized_=
keys<br>
-=A0 =A0 =A0 =A0 =A0 =A0 =A0 echo $pubkey &gt; /root/.ssh/authorized_keys<b=
r>
-=A0 =A0 =A0 =A0 =A0 =A0 fi<br>
-=A0 =A0 =A0 =A0 =A0 done &lt; /dev/vport0p1<br>
+=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0while [$cmd -eq &quot;&quot;]; do<br>
+=A0 =A0 =A0 =A0 =A0 =A0 while read line; do<br>
+=A0 =A0 =A0 =A0 =A0 =A0 =A0 if [[ $line =3D=3D cmdline:* ]]; then<br>
+=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 cmd=3D${line//cmdline:/}<br>
+=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 echo $cmd &gt; /var/cache/cloud/cmdline<br=
>
+=A0 =A0 =A0 =A0 =A0 =A0 =A0 elif [[ $line =3D=3D pubkey:* ]]; then<br>
+=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 pubkey=3D${line//pubkey:/}<br>
+=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 echo $pubkey &gt; /var/cache/cloud/authori=
zed_keys<br>
+=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 echo $pubkey &gt; /root/.ssh/authorized_ke=
ys<br>
+=A0 =A0 =A0 =A0 =A0 =A0 =A0 fi<br>
+=A0 =A0 =A0 =A0 =A0 =A0 done &lt; /dev/vport0p1<br>
+=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0done<br>
=A0 =A0 =A0 =A0 =A0 =A0chmod go-rwx /root/.ssh/authorized_keys<br>
=A0 =A0 =A0 =A0 =A0 =A0;;<br>
=A0 =A0 =A0 vmware)<br>
<br>
</blockquote></div><br></div></div>

--f46d0438903b67ed6905085e0e80--