Module Name: src
Committed By: jmcneill
Date: Wed Aug 5 01:35:19 UTC 2020
Modified Files:
src/distrib/amd64/liveimage/emuimage: Makefile
src/distrib/common/bootimage: Makefile.bootimage
Added Files:
src/distrib/amd64/liveimage/emuimage: dhcpcd ec2_init resize_disklabel
resize_root spec.emuimage sshd
Log Message:
Add support for EC2 and resize root to AMD64 live images.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/distrib/amd64/liveimage/emuimage/Makefile
cvs rdiff -u -r0 -r1.1 src/distrib/amd64/liveimage/emuimage/dhcpcd \
src/distrib/amd64/liveimage/emuimage/ec2_init \
src/distrib/amd64/liveimage/emuimage/resize_disklabel \
src/distrib/amd64/liveimage/emuimage/resize_root \
src/distrib/amd64/liveimage/emuimage/spec.emuimage \
src/distrib/amd64/liveimage/emuimage/sshd
cvs rdiff -u -r1.25 -r1.26 src/distrib/common/bootimage/Makefile.bootimage
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.7 src/distrib/amd64/liveimage/emuimage/Makefile:1.8
--- src/distrib/amd64/liveimage/emuimage/Makefile:1.7 Sun Aug 11 11:00:30 2019
+++ src/distrib/amd64/liveimage/emuimage/Makefile Wed Aug 5 01:35:18 2020
@@ -1,8 +1,22 @@
-# $NetBSD: Makefile,v 1.7 2019/08/11 11:00:30 gson Exp $
+# $NetBSD: Makefile,v 1.8 2020/08/05 01:35:18 jmcneill Exp $
LIVEIMGBASE= NetBSD-${DISTRIBVER}-amd64-live # gives ${IMGBASE}.img
EMUIMAGEMB?= 1907 # 2GB USB flash memories aren't 2GiB
LIVEIMAGEMB= ${EMUIMAGEMB}
+SWAPMB= 0 # No swap
+IMAGEHOSTNAME= netbsd
+
+FILESDIR!= cd ${.CURDIR}/../../../utils/embedded/files ; pwd
+
+SPEC_EXTRA= ${.CURDIR}/spec.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
.include "${.CURDIR}/../Makefile.liveimage"
Index: src/distrib/common/bootimage/Makefile.bootimage
diff -u src/distrib/common/bootimage/Makefile.bootimage:1.25 src/distrib/common/bootimage/Makefile.bootimage:1.26
--- src/distrib/common/bootimage/Makefile.bootimage:1.25 Thu May 28 15:13:21 2020
+++ src/distrib/common/bootimage/Makefile.bootimage Wed Aug 5 01:35:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.25 2020/05/28 15:13:21 jmcneill Exp $
+# $NetBSD: Makefile.bootimage,v 1.26 2020/08/05 01:35:18 jmcneill Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -135,6 +135,8 @@
# FATFILES
# list of additional files to be copied into FAT partition
# (default: empty)
+# IMAGEHOSTNAME
+# if set, sets the default hostname in rc.conf (default: empty)
#
.include <bsd.own.mk> #
@@ -345,6 +347,16 @@ ${TARGETFS}: prepare_md_post ${WORKFSTAB
@echo Setting rc_configured=YES in /etc/rc.conf ...
${TOOL_SED} "s/rc_configured=NO/rc_configured=YES/" \
< ${WORKDIR}/etc/rc.conf > ${WORKRCCONF}
+.if defined(IMAGEHOSTNAME)
+ @echo Setting hostname=${IMAGEHOSTNAME} in /etc/rc.conf ...
+ echo "hostname=${IMAGEHOSTNAME}" >> ${WORKRCCONF}
+.endif
+.if ${SWAPSECTORS} == 0
+ @echo Setting no_swap=YES in /etc/rc.conf ...
+ echo "no_swap=YES" >> ${WORKRCCONF}
+ @echo Setting savecore=NO in /etc/rc.conf ...
+ echo "savecore=NO" >> ${WORKRCCONF}
+.endif
${INSTALL} ${COPY} -m 0644 ${WORKRCCONF} ${WORKDIR}/etc/rc.conf
.if defined(IMGDIR_EXTRA)
@echo Copying extra dirs...
Added files:
Index: src/distrib/amd64/liveimage/emuimage/dhcpcd
diff -u /dev/null src/distrib/amd64/liveimage/emuimage/dhcpcd:1.1
--- /dev/null Wed Aug 5 01:35:19 2020
+++ src/distrib/amd64/liveimage/emuimage/dhcpcd Wed Aug 5 01:35:18 2020
@@ -0,0 +1,3 @@
+# $NetBSD: dhcpcd,v 1.1 2020/08/05 01:35:18 jmcneill Exp $
+
+dhcpcd=YES
Index: src/distrib/amd64/liveimage/emuimage/ec2_init
diff -u /dev/null src/distrib/amd64/liveimage/emuimage/ec2_init:1.1
--- /dev/null Wed Aug 5 01:35:19 2020
+++ src/distrib/amd64/liveimage/emuimage/ec2_init Wed Aug 5 01:35:18 2020
@@ -0,0 +1,15 @@
+# $NetBSD: ec2_init,v 1.1 2020/08/05 01:35:18 jmcneill Exp $
+
+is_ec2() {
+ dmi_vendor="$(/sbin/sysctl -qn machdep.dmi.system-vendor | tr '[A-Z]' '[a-z]')"
+ case "$dmi_vendor" in
+ amazon*)
+ printf YES
+ ;;
+ *)
+ printf NO
+ ;;
+ esac
+}
+
+ec2_init=$(is_ec2)
Index: src/distrib/amd64/liveimage/emuimage/resize_disklabel
diff -u /dev/null src/distrib/amd64/liveimage/emuimage/resize_disklabel:1.1
--- /dev/null Wed Aug 5 01:35:19 2020
+++ src/distrib/amd64/liveimage/emuimage/resize_disklabel Wed Aug 5 01:35:18 2020
@@ -0,0 +1,3 @@
+# $NetBSD: resize_disklabel,v 1.1 2020/08/05 01:35:18 jmcneill Exp $
+
+resize_disklabel=YES
Index: src/distrib/amd64/liveimage/emuimage/resize_root
diff -u /dev/null src/distrib/amd64/liveimage/emuimage/resize_root:1.1
--- /dev/null Wed Aug 5 01:35:19 2020
+++ src/distrib/amd64/liveimage/emuimage/resize_root Wed Aug 5 01:35:18 2020
@@ -0,0 +1,5 @@
+# $NetBSD: resize_root,v 1.1 2020/08/05 01:35:18 jmcneill Exp $
+
+resize_root=YES
+resize_root_flags="-p"
+resize_root_postcmd="/sbin/reboot -n"
Index: src/distrib/amd64/liveimage/emuimage/spec.emuimage
diff -u /dev/null src/distrib/amd64/liveimage/emuimage/spec.emuimage:1.1
--- /dev/null Wed Aug 5 01:35:19 2020
+++ src/distrib/amd64/liveimage/emuimage/spec.emuimage Wed Aug 5 01:35:18 2020
@@ -0,0 +1,8 @@
+# $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
+./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
Index: src/distrib/amd64/liveimage/emuimage/sshd
diff -u /dev/null src/distrib/amd64/liveimage/emuimage/sshd:1.1
--- /dev/null Wed Aug 5 01:35:19 2020
+++ src/distrib/amd64/liveimage/emuimage/sshd Wed Aug 5 01:35:18 2020
@@ -0,0 +1,3 @@
+# $NetBSD: sshd,v 1.1 2020/08/05 01:35:18 jmcneill Exp $
+
+sshd=YES
