From 18b230db7494802c906a6b3574cd58ad1f68a4fc Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Fri, 5 Dec 2014 15:17:55 +0100 Subject: [PATCH] Revert "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" This reverts commit 83656a6ea81ce9b85c2f480e576fd02d8a58c357. The systemvm/routers will reboot automatically if the systemvm.iso changes. They will stuck during the startup due to this commit because the virtio-port are empty. --- .../config/etc/init.d/cloud-early-config | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) 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 294ae5fbeb2..11d0612beab 100755 --- a/systemvm/patches/debian/config/etc/init.d/cloud-early-config +++ b/systemvm/patches/debian/config/etc/init.d/cloud-early-config @@ -117,18 +117,16 @@ get_boot_params() { if [ ! -e /dev/vport0p1 ]; then log_it "/dev/vport0p1 not loaded, perhaps guest kernel is too old." && exit 2 fi - 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 + 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 chmod go-rwx /root/.ssh/authorized_keys ;; vmware)