From 06dae1adc1221292b4e8cc412c744feb7916f5d5 Mon Sep 17 00:00:00 2001 From: lantz Date: Sat, 6 Feb 2021 15:55:40 -0800 Subject: [PATCH] fix bootAndRun() (#1024) * rc.local: /usr/bin/bash -> /bin/bash bash is (and should be) located in /bin this may have caused ubuntu 18.04 to not execute /etc/rc.local and regenerate ssh keys * fix bootAndRun() --- util/install.sh | 2 +- util/vm/build.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/util/install.sh b/util/install.sh index a6fd166..7e8783e 100755 --- a/util/install.sh +++ b/util/install.sh @@ -791,7 +791,7 @@ function vm_clean { echo 'Removing SSH keys from /etc/ssh/' sudo rm -f /etc/ssh/*key* if [ ! -e /etc/rc.local ]; then - echo '#!/usr/bin/bash' | sudo tee /etc/rc.local + echo '#!/bin/bash' | sudo tee /etc/rc.local sudo chmod +x /etc/rc.local fi if ! grep mininet /etc/rc.local >& /dev/null; then diff --git a/util/vm/build.py b/util/vm/build.py index a9f2860..b0e056a 100755 --- a/util/vm/build.py +++ b/util/vm/build.py @@ -954,7 +954,8 @@ def bootAndRun( image, prompt=Prompt, memory=1024, cpuCores=1, outputFile=None, log( '* Creating COW disk', cow ) run( 'qemu-img create -f qcow2 -b %s %s' % ( image, cow ) ) log( '* Extracting kernel and initrd' ) - kernel, initrd, part = extractKernel( image, flavor=basename, imageDir=tmpdir ) + kernel, initrd, partnum = extractKernel( + image, flavor=basename, imageDir=tmpdir ) if LogToConsole: logfile = stdout else: @@ -962,7 +963,7 @@ def bootAndRun( image, prompt=Prompt, memory=1024, cpuCores=1, outputFile=None, suffix='.testlog', delete=False ) log( '* Logging VM output to', logfile.name ) vm = boot( cow=cow, kernel=kernel, initrd=initrd, logfile=logfile, - memory=memory, cpuCores=cpuCores, part=part ) + memory=memory, cpuCores=cpuCores, partnum=partnum ) login( vm ) log( '* Waiting for prompt after login' ) vm.expect( prompt )