lab/mininet
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix bootAndRun() (#1024)

Browse Source 
* 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()
This commit is contained in:
lantz
2021-02-06 15:55:40 -08:00
committed by GitHub
parent f0c726a42f
commit 06dae1adc1
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/install.sh
+1 -1
View File
@@ -791,7 +791,7 @@ function vm_clean {
echo 'Removing SSH keys from /etc/ssh/' echo 'Removing SSH keys from /etc/ssh/'
sudo rm -f /etc/ssh/*key* sudo rm -f /etc/ssh/*key*
if [ ! -e /etc/rc.local ]; then 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 sudo chmod +x /etc/rc.local
fi fi
if ! grep mininet /etc/rc.local >& /dev/null; then if ! grep mininet /etc/rc.local >& /dev/null; then
util/vm/build.py
+3 -2
View File
@@ -954,7 +954,8 @@ def bootAndRun( image, prompt=Prompt, memory=1024, cpuCores=1, outputFile=None,
log( '* Creating COW disk', cow ) log( '* Creating COW disk', cow )
run( 'qemu-img create -f qcow2 -b %s %s' % ( image, cow ) ) run( 'qemu-img create -f qcow2 -b %s %s' % ( image, cow ) )
log( '* Extracting kernel and initrd' ) 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: if LogToConsole:
logfile = stdout logfile = stdout
else: else:
@@ -962,7 +963,7 @@ def bootAndRun( image, prompt=Prompt, memory=1024, cpuCores=1, outputFile=None,
suffix='.testlog', delete=False ) suffix='.testlog', delete=False )
log( '* Logging VM output to', logfile.name ) log( '* Logging VM output to', logfile.name )
vm = boot( cow=cow, kernel=kernel, initrd=initrd, logfile=logfile, vm = boot( cow=cow, kernel=kernel, initrd=initrd, logfile=logfile,
memory=memory, cpuCores=cpuCores, part=part ) memory=memory, cpuCores=cpuCores, partnum=partnum )
login( vm ) login( vm )
log( '* Waiting for prompt after login' ) log( '* Waiting for prompt after login' )
vm.expect( prompt ) vm.expect( prompt )