config

lf-edge · Nov 27, 2023 · d44656d · d44656d
1 parent 54d8c60
commit d44656d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -245,7 +245,7 @@ QEMU_OPTS_arm64=-smbios type=1,serial=$(QEMU_EVE_SERIAL) -drive file=fat:rw:$(di
 QEMU_OPTS_riscv64=-kernel $(UBOOT_IMG)/u-boot.bin -device virtio-blk,drive=uefi-disk
 QEMU_OPTS_COMMON= -m $(QEMU_MEMORY) -smp 4 -display none $(QEMU_OPTS_BIOS) \
         -serial mon:stdio      \
-	-global ICH9-LPC.noreboot=false -watchdog-action reset \
+	-global ICH9-LPC.noreboot=false \
         -rtc base=utc,clock=rt \
         -netdev user,id=eth0,net=$(QEMU_OPTS_NET1),dhcpstart=$(QEMU_OPTS_NET1_FIRST_IP),hostfwd=tcp::$(SSH_PORT)-:22$(QEMU_TFTP_OPTS) -device virtio-net-pci,netdev=eth0,romfile="" \
         -netdev user,id=eth1,net=$(QEMU_OPTS_NET2),dhcpstart=$(QEMU_OPTS_NET2_FIRST_IP) -device virtio-net-pci,netdev=eth1,romfile="" \

diff --git a/conf/authorized_keys b/conf/authorized_keys
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQClgmup8fb/3fMxs5+GvAE9Dbs54gjbi3H4DPeTlupzSdPXbjX16tHi+Nea9juu6RcJnZu4ksc/2SgKRIgFS1kDC/e1745gubYFZ5LgENo1+Hx8qEMWDZZRdr1AwPAQaC9nG0xQxW2zDST+9v9TV3gJfSqs/xT0dvn7uzaeD2wb7Ucjsjue9A9xXzIl0SHfpYV0DF1s7Bfcnq4pf9EklmPR6f7i4QwySFAO9cTZvsaaWqv1hp3C1b2xAzrYI+DhOEF7EyDBl76Xkor5xk0aCjRndOrxS2a7JffcNIHdiRFgbLZCL3sDrO5aQ9DcJIZ4/nPDOfNCgocHRLMtvTmvtFtW3s+bDwBvmkzjpwGIx++0Gau1gEkFgz+/XQiIm1T5LHdIsNQAdRGRyBKtKXSBSH/NXNNn7ZjwcEm71g6lXkSzYGgxTWcBScnxoPWXeSYfVPJCkpraMAVYjt0hTqlKPrYfohVfe4Zb9ru8ZpYMNP4Er0b0AZnWgWKdYttkvhuYiwE= christoph@ponyhof
diff --git a/conf/server b/conf/server
@@ -1 +1 @@
-zedcloud.alpha.zededa.net
+zedcloud.local.zededa.net
diff --git a/pkg/edgeview/src/edge-view-init.sh b/pkg/edgeview/src/edge-view-init.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+echo '10.208.13.41 zedcloud.local.zededa.net' >> /etc/hosts
+
 if [ -z "$EDGEVIEW_CLIENT" ]; then
   [ -f /config/hosts ] && cat /config/hosts >> /etc/hosts
 

diff --git a/pkg/pillar/rootfs/init.sh b/pkg/pillar/rootfs/init.sh
@@ -5,6 +5,9 @@
 # Start with a default content for resolv.conf
 echo 'nameserver 8.8.8.8' > /etc/resolv.conf
 
+echo '10.208.13.41 zedcontrol.local.zededa.net' >> /etc/hosts
+echo '10.208.13.41 zedcloud.local.zededa.net' >> /etc/hosts
+
 #Copy pre-defined fscrypt.conf
 cp fscrypt.conf /etc/fscrypt.conf
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQClgmup8fb/3fMxs5+GvAE9Dbs54gjbi3H4DPeTlupzSdPXbjX16tHi+Nea9juu6RcJnZu4ksc/2SgKRIgFS1kDC/e1745gubYFZ5LgENo1+Hx8qEMWDZZRdr1AwPAQaC9nG0xQxW2zDST+9v9TV3gJfSqs/xT0dvn7uzaeD2wb7Ucjsjue9A9xXzIl0SHfpYV0DF1s7Bfcnq4pf9EklmPR6f7i4QwySFAO9cTZvsaaWqv1hp3C1b2xAzrYI+DhOEF7EyDBl76Xkor5xk0aCjRndOrxS2a7JffcNIHdiRFgbLZCL3sDrO5aQ9DcJIZ4/nPDOfNCgocHRLMtvTmvtFtW3s+bDwBvmkzjpwGIx++0Gau1gEkFgz+/XQiIm1T5LHdIsNQAdRGRyBKtKXSBSH/NXNNn7ZjwcEm71g6lXkSzYGgxTWcBScnxoPWXeSYfVPJCkpraMAVYjt0hTqlKPrYfohVfe4Zb9ru8ZpYMNP4Er0b0AZnWgWKdYttkvhuYiwE= christoph@ponyhof
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		zedcloud.alpha.zededa.net
		zedcloud.local.zededa.net