Thu Jul 15 17:20:25 2021 UTC ()
Recognize OpenStack too (it also has a metadata service).

Typical values for machdep.dmi are:

machdep.dmi.system-vendor = OpenStack Foundation
machdep.dmi.system-product = OpenStack Nova
machdep.dmi.system-version = 17.0.12
machdep.dmi.system-serial = c46130fb-a56e-43f2-9d98-492d24656b9c
machdep.dmi.system-uuid = 680b8119-0d74-4f78-a6fd-e79dfede905c
machdep.dmi.bios-vendor = SeaBIOS
machdep.dmi.bios-version = 1.10.2-1ubuntu1
machdep.dmi.bios-date = 20140401
machdep.dmi.chassis-vendor = QEMU
machdep.dmi.chassis-type = QEMU
machdep.dmi.chassis-version = pc-i440fx-2.8
machdep.dmi.processor-vendor = QEMU
machdep.dmi.processor-version = pc-i440fx-2.8
machdep.dmi.processor-frequency = 2000 MHz


(rhialto)
diff -r1.2 -r1.3 src/distrib/amd64/liveimage/emuimage/ec2_init
cvs diff -r1.2 -r1.3 src/distrib/amd64/liveimage/emuimage/Attic/ec2_init (expand / switch to unified diff)

--- src/distrib/amd64/liveimage/emuimage/Attic/ec2_init 2020/09/09 13:25:48 1.2
+++ src/distrib/amd64/liveimage/emuimage/Attic/ec2_init 2021/07/15 17:20:25 1.3
@@ -1,22 +1,26 @@ @@ -1,22 +1,26 @@
1# $NetBSD: ec2_init,v 1.2 2020/09/09 13:25:48 jmcneill Exp $ 1# $NetBSD: ec2_init,v 1.3 2021/07/15 17:20:25 rhialto Exp $
2 2
3is_ec2() { 3is_ec2() {
4 val=NO 4 val=NO
5 # Look for the string "amazon" in one of these sysctl nodes 5 # Look for the string "amazon" in one of these sysctl nodes
6 for node in machdep.dmi.system-vendor \ 6 for node in machdep.dmi.system-vendor \
7 machdep.dmi.system-version \ 7 machdep.dmi.system-version \
8 machdep.dmi.bios-version \ 8 machdep.dmi.bios-version \
9 machdep.xen.version ; do 9 machdep.xen.version ; do
10 if /sbin/sysctl -q $node; then 10 if /sbin/sysctl -q $node; then
11 nodeval="$(/sbin/sysctl -n $node | tr '[A-Z]' '[a-z]')" 11 nodeval="$(/sbin/sysctl -n $node | tr '[A-Z]' '[a-z]')"
12 case "$nodeval" in 12 case "$nodeval" in
13 *amazon*) 13 *amazon*)
14 val=YES 14 val=YES
15 ;; 15 ;;
 16 # OpenStack is not EC2 but it does have a metadata service.
 17 *openstack*)
 18 val=YES
 19 ;;
16 esac 20 esac
17 fi 21 fi
18 done 22 done
19 printf $val 23 printf $val
20} 24}
21 25
22ec2_init=$(is_ec2) 26ec2_init=$(is_ec2)