amd64: liveimage: use RC_CONF_EXTRA instead of rc.conf.ddiff -r1.8 -r1.9 src/distrib/amd64/liveimage/emuimage/Makefile
(jmcneill)
--- src/distrib/amd64/liveimage/emuimage/Makefile 2020/08/05 01:35:18 1.8
+++ src/distrib/amd64/liveimage/emuimage/Makefile 2021/07/24 16:13:44 1.9
| @@ -1,22 +1,18 @@ | @@ -1,22 +1,18 @@ | |||
| 1 | # $NetBSD: Makefile,v 1.8 2020/08/05 01:35:18 jmcneill Exp $ | 1 | # $NetBSD: Makefile,v 1.9 2021/07/24 16:13:44 jmcneill Exp $ | |
| 2 | 2 | |||
| 3 | LIVEIMGBASE= NetBSD-${DISTRIBVER}-amd64-live # gives ${IMGBASE}.img | 3 | LIVEIMGBASE= NetBSD-${DISTRIBVER}-amd64-live # gives ${IMGBASE}.img | |
| 4 | 4 | |||
| 5 | EMUIMAGEMB?= 1907 # 2GB USB flash memories aren't 2GiB | 5 | EMUIMAGEMB?= 1907 # 2GB USB flash memories aren't 2GiB | |
| 6 | LIVEIMAGEMB= ${EMUIMAGEMB} | 6 | LIVEIMAGEMB= ${EMUIMAGEMB} | |
| 7 | SWAPMB= 0 # No swap | 7 | SWAPMB= 0 # No swap | |
| 8 | IMAGEHOSTNAME= netbsd | 8 | IMAGEHOSTNAME= netbsd | |
| 9 | 9 | |||
| 10 | FILESDIR!= cd ${.CURDIR}/../../../utils/embedded/files ; pwd | 10 | FILESDIR!= cd ${.CURDIR}/../../../utils/embedded/files ; pwd | |
| 11 | 11 | |||
| 12 | SPEC_EXTRA= ${.CURDIR}/spec.emuimage | 12 | SPEC_EXTRA= ${.CURDIR}/spec.emuimage | |
| 13 | RC_CONF_EXTRA= ${.CURDIR}/rc.conf.emuimage | |||
| 13 | IMGFILE_EXTRA= \ | 14 | IMGFILE_EXTRA= \ | |
| 14 | ${FILESDIR}/ec2_init etc/rc.d/ec2_init \ | 15 | ${FILESDIR}/ec2_init etc/rc.d/ec2_init \ | |
| 15 | ${FILESDIR}/resize_disklabel etc/rc.d/resize_disklabel \ | 16 | ${FILESDIR}/resize_disklabel etc/rc.d/resize_disklabel | |
| 16 | ${.CURDIR}/dhcpcd etc/rc.conf.d/dhcpcd \ | |||
| 17 | ${.CURDIR}/ec2_init etc/rc.conf.d/ec2_init \ | |||
| 18 | ${.CURDIR}/resize_disklabel etc/rc.conf.d/resize_disklabel \ | |||
| 19 | ${.CURDIR}/resize_root etc/rc.conf.d/resize_root \ | |||
| 20 | ${.CURDIR}/sshd etc/rc.conf.d/sshd | |||
| 21 | 17 | |||
| 22 | .include "${.CURDIR}/../Makefile.liveimage" | 18 | .include "${.CURDIR}/../Makefile.liveimage" |
# $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
--- src/distrib/amd64/liveimage/emuimage/spec.emuimage 2020/08/05 01:35:18 1.1
+++ src/distrib/amd64/liveimage/emuimage/spec.emuimage 2021/07/24 16:13:44 1.2
| @@ -1,8 +1,3 @@ | @@ -1,8 +1,3 @@ | |||
| 1 | # $NetBSD: spec.emuimage,v 1.1 2020/08/05 01:35:18 jmcneill Exp $ | 1 | # $NetBSD: spec.emuimage,v 1.2 2021/07/24 16:13:44 jmcneill Exp $ | |
| 2 | ./etc/rc.conf.d/dhcpcd type=file mode=0644 uname=root gname=wheel | |||
| 3 | ./etc/rc.conf.d/ec2_init type=file mode=0644 uname=root gname=wheel | |||
| 4 | ./etc/rc.conf.d/resize_disklabel type=file mode=0644 uname=root gname=wheel | |||
| 5 | ./etc/rc.conf.d/resize_root type=file mode=0644 uname=root gname=wheel | |||
| 6 | ./etc/rc.conf.d/sshd type=file mode=0644 uname=root gname=wheel | |||
| 7 | ./etc/rc.d/ec2_init type=file mode=0555 uname=root gname=wheel | 2 | ./etc/rc.d/ec2_init type=file mode=0555 uname=root gname=wheel | |
| 8 | ./etc/rc.d/resize_disklabel type=file mode=0555 uname=root gname=wheel | 3 | ./etc/rc.d/resize_disklabel type=file mode=0555 uname=root gname=wheel |