Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

evbarm: liveimage: use RC_CONF_EXTRA instead of rc.conf.d

Browse Source
This commit is contained in:
jmcneill 2021-07-24 14:00:08 +00:00
parent e5de8b183d
commit 9764bcee56
7 changed files with 15 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
distrib/evbarm/liveimage/armimage/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2021/07/23 21:53:34 jmcneill Exp $ # $NetBSD: Makefile,v 1.2 2021/07/24 14:00:08 jmcneill Exp $
LIVEIMGBASE= NetBSD-${DISTRIBVER}-${MACHINE_ARCH}-live # gives ${IMGBASE}.img LIVEIMGBASE= NetBSD-${DISTRIBVER}-${MACHINE_ARCH}-live # gives ${IMGBASE}.img
@ -10,13 +10,9 @@ IMAGEHOSTNAME= netbsd
FILESDIR!= cd ${.CURDIR}/../../../utils/embedded/files ; pwd FILESDIR!= cd ${.CURDIR}/../../../utils/embedded/files ; pwd
SPEC_EXTRA= ${.CURDIR}/spec.armimage SPEC_EXTRA= ${.CURDIR}/spec.armimage
RC_CONF_EXTRA= ${.CURDIR}/rc.conf.armimage
IMGFILE_EXTRA= \ IMGFILE_EXTRA= \
${FILESDIR}/ec2_init etc/rc.d/ec2_init \ ${FILESDIR}/ec2_init etc/rc.d/ec2_init \
${FILESDIR}/resize_gpt etc/rc.d/resize_gpt \ ${FILESDIR}/resize_gpt etc/rc.d/resize_gpt
${.CURDIR}/dhcpcd etc/rc.conf.d/dhcpcd \
${.CURDIR}/ec2_init etc/rc.conf.d/ec2_init \
${.CURDIR}/resize_gpt etc/rc.conf.d/resize_gpt \
${.CURDIR}/resize_root etc/rc.conf.d/resize_root \
${.CURDIR}/sshd etc/rc.conf.d/sshd
.include "${.CURDIR}/../Makefile.liveimage" .include "${.CURDIR}/../Makefile.liveimage"

3
distrib/evbarm/liveimage/armimage/dhcpcd
View File

@ -1,3 +0,0 @@
# $NetBSD: dhcpcd,v 1.1 2021/07/23 21:53:34 jmcneill Exp $
dhcpcd=YES

17
distrib/evbarm/liveimage/armimage/ec2_init → distrib/evbarm/liveimage/armimage/rc.conf.armimage
View File

@ -1,4 +1,4 @@
# $NetBSD: ec2_init,v 1.1 2021/07/23 21:53:34 jmcneill Exp $ # $NetBSD: rc.conf.armimage,v 1.1 2021/07/24 14:00:08 jmcneill Exp $
is_ec2() { is_ec2() {
val=NO val=NO
@ -23,9 +23,14 @@ is_ec2() {
printf $val printf $val
} }
# Don't override /etc/rc.conf resize_gpt=YES
if [ -z "$ec2_init" ] resize_root=YES
then resize_root_flags="-p"
ec2_init=$(is_ec2) resize_root_postcmd="/sbin/reboot -n"
fi dhcpcd=YES
sshd=YES
ec2_init=$(is_ec2)
if checkyesno ec2_init; then
dhcpcd_flags="$dhcpcd_flags -w"
fi

3
distrib/evbarm/liveimage/armimage/resize_gpt
View File

@ -1,3 +0,0 @@
# $NetBSD: resize_gpt,v 1.1 2021/07/23 21:53:34 jmcneill Exp $
resize_gpt=YES

5
distrib/evbarm/liveimage/armimage/resize_root
View File

@ -1,5 +0,0 @@
# $NetBSD: resize_root,v 1.1 2021/07/23 21:53:34 jmcneill Exp $
resize_root=YES
resize_root_flags="-p"
resize_root_postcmd="/sbin/reboot -n"

7
distrib/evbarm/liveimage/armimage/spec.armimage
View File

@ -1,8 +1,3 @@
# $NetBSD: spec.armimage,v 1.1 2021/07/23 21:53:34 jmcneill Exp $ # $NetBSD: spec.armimage,v 1.2 2021/07/24 14:00:08 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_gpt 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/ec2_init type=file mode=0555 uname=root gname=wheel
./etc/rc.d/resize_gpt type=file mode=0555 uname=root gname=wheel ./etc/rc.d/resize_gpt type=file mode=0555 uname=root gname=wheel

3
distrib/evbarm/liveimage/armimage/sshd
View File

@ -1,3 +0,0 @@
# $NetBSD: sshd,v 1.1 2021/07/23 21:53:34 jmcneill Exp $
sshd=YES