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

Fix previous so that the new generated rc.conf is picked up and that

Browse Source 
any new new mount points (e.g. /proc and /kern) are generated.

While here increate the fs size so that postfix can actually build
/etc/mail/aliases.db
This commit is contained in:
skrll 2015-01-29 14:54:06 +00:00
parent b3decb4766
commit 6931a97454
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
distrib/utils/embedded/conf/evbarm.conf
View File

@ -1,4 +1,4 @@
# $NetBSD: evbarm.conf,v 1.19 2015/01/28 12:08:00 jmcneill Exp $ # $NetBSD: evbarm.conf,v 1.20 2015/01/29 14:54:06 skrll Exp $
# evbarm shared config # evbarm shared config
# #
image=$HOME/${board}.img image=$HOME/${board}.img
@ -6,7 +6,7 @@ image=$HOME/${board}.img
MACHINE=evbarm MACHINE=evbarm
swap=256 swap=256
extra=8 # spare space extra=48 # spare space
boot=112 boot=112
init=8 init=8
ffsoffset=$(( (${init} + ${boot} + ${swap}) / 2 ))m ffsoffset=$(( (${init} + ${boot} + ${swap}) / 2 ))m
@ -110,6 +110,12 @@ make_fstab_evbarm() {
fi fi
echo "./etc/fstab type=file uname=root gname=wheel mode=0644" \ echo "./etc/fstab type=file uname=root gname=wheel mode=0644" \
>> "$tmp/selected_sets" >> "$tmp/selected_sets"
# Missing mount points from fstab
echo "./proc type=dir uname=root gname=wheel mode=0755" \
>> "$tmp/selected_sets"
echo "./kern type=dir uname=root gname=wheel mode=0755" \
>> "$tmp/selected_sets"
} }
customize_evbarm() { customize_evbarm() {
@ -128,6 +134,9 @@ dhcpcd=YES
ntpd=YES ntpd=YES
ntpd_flags="-g" ntpd_flags="-g"
EOF EOF
echo "./etc/rc.conf type=file uname=root gname=wheel mode=0644" \
>> "$tmp/selected_sets"
if [ ! -f ${release}/dev/MAKEDEV ]; then if [ ! -f ${release}/dev/MAKEDEV ]; then
echo ${PROG}: Missing ${release}/dev/MAKEDEV 1>&2 echo ${PROG}: Missing ${release}/dev/MAKEDEV 1>&2
exit 1 exit 1

13
distrib/utils/embedded/conf/x86.conf
View File

@ -1,4 +1,4 @@
# $NetBSD: x86.conf,v 1.6 2015/01/23 15:17:58 skrll Exp $ # $NetBSD: x86.conf,v 1.7 2015/01/29 14:54:06 skrll Exp $
# x86 shared config # x86 shared config
# #
@ -93,6 +93,11 @@ make_fstab() {
fi fi
echo "./etc/fstab type=file uname=root gname=wheel mode=0755" \ echo "./etc/fstab type=file uname=root gname=wheel mode=0755" \
>> "$tmp/selected_sets" >> "$tmp/selected_sets"
echo "./proc type=dir uname=root gname=wheel mode=0755" \
>> "$tmp/selected_sets"
echo "./kern type=dir uname=root gname=wheel mode=0755" \
>> "$tmp/selected_sets"
} }
customize() { customize() {
@ -111,6 +116,9 @@ dhcpcd=YES
wscons=YES wscons=YES
devpubd=YES devpubd=YES
EOF EOF
echo "./etc/rc.conf type=file uname=root gname=wheel mode=0644" \
>> "$tmp/selected_sets"
if [ ! -f ${release}/dev/MAKEDEV ]; then if [ ! -f ${release}/dev/MAKEDEV ]; then
echo ${PROG}: Missing ${release}/dev/MAKEDEV 1>&2 echo ${PROG}: Missing ${release}/dev/MAKEDEV 1>&2
exit 1 exit 1
@ -118,9 +126,6 @@ EOF
echo "${bar} running MAKEDEV ${bar}" echo "${bar} running MAKEDEV ${bar}"
${HOST_SH} ${release}/dev/MAKEDEV -s all | sed -e 's:^\./:\./dev/:' \ ${HOST_SH} ${release}/dev/MAKEDEV -s all | sed -e 's:^\./:\./dev/:' \
>> "$tmp/selected_sets" >> "$tmp/selected_sets"
echo "${bar} creating directories ${bar}"
mkdir ${mnt}/proc ${mnt}/kern
} }
populate() { populate() {

4
distrib/utils/embedded/mkimage
View File

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
# $NetBSD: mkimage,v 1.51 2015/01/23 15:17:58 skrll Exp $ # $NetBSD: mkimage,v 1.52 2015/01/29 14:54:06 skrll Exp $
# #
# Copyright (c) 2013, 2014 The NetBSD Foundation, Inc. # Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
# All rights reserved. # All rights reserved.
@ -176,7 +176,7 @@ fi
if [ -z "${bootonly}" ]; then if [ -z "${bootonly}" ]; then
echo ${bar} Populating ffs filesystem ${bar} echo ${bar} Populating ffs filesystem ${bar}
${MAKEFS} -N ${release}/etc -t ffs -rx \ ${MAKEFS} -r -N ${release}/etc -t ffs -rx \
-O ${ffsoffset} \ -O ${ffsoffset} \
-o d=4096 -b $((${extra}))m \ -o d=4096 -b $((${extra}))m \
-F "$tmp/selected_sets" ${image} "${release}" "${mnt}" -F "$tmp/selected_sets" ${image} "${release}" "${mnt}"