From cc79d867453e11914aa070d321e4febf9cffca6e Mon Sep 17 00:00:00 2001 From: Jim Mussared Date: Wed, 17 Jan 2018 21:39:46 +1100 Subject: [PATCH 1/2] Make qemu script work on Arch --- Makefile | 2 +- scripts/build-qemu.sh | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f6b7bd9f9..067491f09 100644 --- a/Makefile +++ b/Makefile @@ -311,7 +311,7 @@ tftpd_start: sudo true @if sudo which atftpd >/dev/null ; then \ echo "Starting aftpd"; \ - sudo atftpd --verbose --bind-address $(TFTP_IPRANGE).100 --daemon --logfile /dev/stdout --no-fork --user $(shell whoami) $(TFTPD_DIR) & \ + sudo atftpd --verbose --bind-address $(TFTP_IPRANGE).100 --daemon --logfile /dev/stdout --no-fork --user $(shell whoami) --group $(shell whoami) $(TFTPD_DIR) & \ elif sudo which in.tftpd >/dev/null; then \ echo "Starting in.tftpd"; \ sudo in.tftpd --verbose --listen --address $(TFTP_IPRANGE).100 --user $(shell whoami) -s $(TFTPD_DIR) & \ diff --git a/scripts/build-qemu.sh b/scripts/build-qemu.sh index 60f587730..2e498f55d 100755 --- a/scripts/build-qemu.sh +++ b/scripts/build-qemu.sh @@ -129,7 +129,15 @@ if grep -q ETHMAC_BASE $TARGET_BUILD_DIR/software/include/generated/csr.h; then exit 1 fi sudo chown $(whoami) /dev/net/tap0 - sudo ifconfig tap0 $TFTP_IPRANGE.100 up + if sudo which ifconifg > /dev/null; then + sudo ifconfig tap0 $TFTP_IPRANGE.100 up + elif sudo which ip > /dev/null; then + sudo ip addr add $TFTP_IPRANGE.100/24 dev tap0 + sudo ip link set dev tap0 up + else + echo "Unable to find tool to configure tap0 address" + exit 1 + fi make tftpd_start fi EXTRA_ARGS+=("-net nic -net tap,ifname=tap0,script=no,downscript=no") From 26eeeefcc6879002c124d02d531996ade9290ce3 Mon Sep 17 00:00:00 2001 From: Jim Mussared Date: Thu, 18 Jan 2018 13:37:18 +1100 Subject: [PATCH 2/2] Use default group instead --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 067491f09..cc96897fa 100644 --- a/Makefile +++ b/Makefile @@ -311,7 +311,7 @@ tftpd_start: sudo true @if sudo which atftpd >/dev/null ; then \ echo "Starting aftpd"; \ - sudo atftpd --verbose --bind-address $(TFTP_IPRANGE).100 --daemon --logfile /dev/stdout --no-fork --user $(shell whoami) --group $(shell whoami) $(TFTPD_DIR) & \ + sudo atftpd --verbose --bind-address $(TFTP_IPRANGE).100 --daemon --logfile /dev/stdout --no-fork --user $(shell whoami) --group $(shell id -gn) $(TFTPD_DIR) & \ elif sudo which in.tftpd >/dev/null; then \ echo "Starting in.tftpd"; \ sudo in.tftpd --verbose --listen --address $(TFTP_IPRANGE).100 --user $(shell whoami) -s $(TFTPD_DIR) & \