Module Name: src Committed By: jmcneill Date: Sat Jul 24 16:13:45 UTC 2021
Modified Files: src/distrib/amd64/liveimage/emuimage: Makefile spec.emuimage Added Files: src/distrib/amd64/liveimage/emuimage: rc.conf.emuimage Removed Files: src/distrib/amd64/liveimage/emuimage: dhcpcd ec2_init resize_disklabel resize_root sshd Log Message: amd64: liveimage: use RC_CONF_EXTRA instead of rc.conf.d To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/distrib/amd64/liveimage/emuimage/Makefile cvs rdiff -u -r1.1 -r0 src/distrib/amd64/liveimage/emuimage/dhcpcd \ src/distrib/amd64/liveimage/emuimage/resize_disklabel \ src/distrib/amd64/liveimage/emuimage/resize_root \ src/distrib/amd64/liveimage/emuimage/sshd cvs rdiff -u -r1.4 -r0 src/distrib/amd64/liveimage/emuimage/ec2_init cvs rdiff -u -r0 -r1.1 src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/liveimage/emuimage/spec.emuimage Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/distrib/amd64/liveimage/emuimage/Makefile diff -u src/distrib/amd64/liveimage/emuimage/Makefile:1.8 src/distrib/amd64/liveimage/emuimage/Makefile:1.9 --- src/distrib/amd64/liveimage/emuimage/Makefile:1.8 Wed Aug 5 01:35:18 2020 +++ src/distrib/amd64/liveimage/emuimage/Makefile Sat Jul 24 16:13:44 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2020/08/05 01:35:18 jmcneill Exp $ +# $NetBSD: Makefile,v 1.9 2021/07/24 16:13:44 jmcneill Exp $ LIVEIMGBASE= NetBSD-${DISTRIBVER}-amd64-live # gives ${IMGBASE}.img @@ -10,13 +10,9 @@ IMAGEHOSTNAME= netbsd FILESDIR!= cd ${.CURDIR}/../../../utils/embedded/files ; pwd SPEC_EXTRA= ${.CURDIR}/spec.emuimage +RC_CONF_EXTRA= ${.CURDIR}/rc.conf.emuimage IMGFILE_EXTRA= \ ${FILESDIR}/ec2_init etc/rc.d/ec2_init \ - ${FILESDIR}/resize_disklabel etc/rc.d/resize_disklabel \ - ${.CURDIR}/dhcpcd etc/rc.conf.d/dhcpcd \ - ${.CURDIR}/ec2_init etc/rc.conf.d/ec2_init \ - ${.CURDIR}/resize_disklabel etc/rc.conf.d/resize_disklabel \ - ${.CURDIR}/resize_root etc/rc.conf.d/resize_root \ - ${.CURDIR}/sshd etc/rc.conf.d/sshd + ${FILESDIR}/resize_disklabel etc/rc.d/resize_disklabel .include "${.CURDIR}/../Makefile.liveimage" Index: src/distrib/amd64/liveimage/emuimage/spec.emuimage diff -u src/distrib/amd64/liveimage/emuimage/spec.emuimage:1.1 src/distrib/amd64/liveimage/emuimage/spec.emuimage:1.2 --- src/distrib/amd64/liveimage/emuimage/spec.emuimage:1.1 Wed Aug 5 01:35:18 2020 +++ src/distrib/amd64/liveimage/emuimage/spec.emuimage Sat Jul 24 16:13:44 2021 @@ -1,8 +1,3 @@ -# $NetBSD: spec.emuimage,v 1.1 2020/08/05 01:35:18 jmcneill Exp $ -./etc/rc.conf.d/dhcpcd type=file mode=0644 uname=root gname=wheel -./etc/rc.conf.d/ec2_init type=file mode=0644 uname=root gname=wheel -./etc/rc.conf.d/resize_disklabel type=file mode=0644 uname=root gname=wheel -./etc/rc.conf.d/resize_root type=file mode=0644 uname=root gname=wheel -./etc/rc.conf.d/sshd type=file mode=0644 uname=root gname=wheel +# $NetBSD: spec.emuimage,v 1.2 2021/07/24 16:13:44 jmcneill Exp $ ./etc/rc.d/ec2_init type=file mode=0555 uname=root gname=wheel ./etc/rc.d/resize_disklabel type=file mode=0555 uname=root gname=wheel Added files: Index: src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage diff -u /dev/null src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage:1.1 --- /dev/null Sat Jul 24 16:13:45 2021 +++ src/distrib/amd64/liveimage/emuimage/rc.conf.emuimage Sat Jul 24 16:13:44 2021 @@ -0,0 +1,36 @@ +# $NetBSD: rc.conf.emuimage,v 1.1 2021/07/24 16:13:44 jmcneill Exp $ + +is_ec2() { + val=NO + # Look for the string "amazon" in one of these sysctl nodes + for node in machdep.dmi.system-vendor \ + machdep.dmi.system-version \ + machdep.dmi.bios-version \ + machdep.xen.version ; do + if /sbin/sysctl -q $node; then + nodeval="$(/sbin/sysctl -n $node | tr '[A-Z]' '[a-z]')" + case "$nodeval" in + *amazon*) + val=YES + ;; + # OpenStack is not EC2 but it does have a metadata service. + *openstack*) + val=YES + ;; + esac + fi + done + printf $val +} + +resize_disklabel=YES +resize_root=YES +resize_root_flags="-p" +resize_root_postcmd="/sbin/reboot -n" +dhcpcd=YES +sshd=YES +ec2_init=$(is_ec2) + +if checkyesno ec2_init; then + dhcpcd_flags="$dhcpcd_flags -w" +fi