Module Name: src Committed By: skrll Date: Thu Jan 29 14:54:06 UTC 2015
Modified Files: src/distrib/utils/embedded: mkimage src/distrib/utils/embedded/conf: evbarm.conf x86.conf Log Message: Fix previous so that the new generated rc.conf is picked up and that 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 To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/distrib/utils/embedded/mkimage cvs rdiff -u -r1.19 -r1.20 src/distrib/utils/embedded/conf/evbarm.conf cvs rdiff -u -r1.6 -r1.7 src/distrib/utils/embedded/conf/x86.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/distrib/utils/embedded/mkimage diff -u src/distrib/utils/embedded/mkimage:1.51 src/distrib/utils/embedded/mkimage:1.52 --- src/distrib/utils/embedded/mkimage:1.51 Fri Jan 23 15:17:58 2015 +++ src/distrib/utils/embedded/mkimage Thu Jan 29 14:54:06 2015 @@ -1,5 +1,5 @@ #!/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. # All rights reserved. @@ -176,7 +176,7 @@ fi if [ -z "${bootonly}" ]; then echo ${bar} Populating ffs filesystem ${bar} - ${MAKEFS} -N ${release}/etc -t ffs -rx \ + ${MAKEFS} -r -N ${release}/etc -t ffs -rx \ -O ${ffsoffset} \ -o d=4096 -b $((${extra}))m \ -F "$tmp/selected_sets" ${image} "${release}" "${mnt}" Index: src/distrib/utils/embedded/conf/evbarm.conf diff -u src/distrib/utils/embedded/conf/evbarm.conf:1.19 src/distrib/utils/embedded/conf/evbarm.conf:1.20 --- src/distrib/utils/embedded/conf/evbarm.conf:1.19 Wed Jan 28 12:08:00 2015 +++ src/distrib/utils/embedded/conf/evbarm.conf Thu Jan 29 14:54:06 2015 @@ -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 # image=$HOME/${board}.img @@ -6,7 +6,7 @@ image=$HOME/${board}.img MACHINE=evbarm swap=256 -extra=8 # spare space +extra=48 # spare space boot=112 init=8 ffsoffset=$(( (${init} + ${boot} + ${swap}) / 2 ))m @@ -110,6 +110,12 @@ make_fstab_evbarm() { fi echo "./etc/fstab type=file uname=root gname=wheel mode=0644" \ >> "$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() { @@ -128,6 +134,9 @@ dhcpcd=YES ntpd=YES ntpd_flags="-g" EOF + echo "./etc/rc.conf type=file uname=root gname=wheel mode=0644" \ + >> "$tmp/selected_sets" + if [ ! -f ${release}/dev/MAKEDEV ]; then echo ${PROG}: Missing ${release}/dev/MAKEDEV 1>&2 exit 1 Index: src/distrib/utils/embedded/conf/x86.conf diff -u src/distrib/utils/embedded/conf/x86.conf:1.6 src/distrib/utils/embedded/conf/x86.conf:1.7 --- src/distrib/utils/embedded/conf/x86.conf:1.6 Fri Jan 23 15:17:58 2015 +++ src/distrib/utils/embedded/conf/x86.conf Thu Jan 29 14:54:06 2015 @@ -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 # @@ -93,6 +93,11 @@ make_fstab() { fi echo "./etc/fstab type=file uname=root gname=wheel mode=0755" \ >> "$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() { @@ -111,6 +116,9 @@ dhcpcd=YES wscons=YES devpubd=YES EOF + echo "./etc/rc.conf type=file uname=root gname=wheel mode=0644" \ + >> "$tmp/selected_sets" + if [ ! -f ${release}/dev/MAKEDEV ]; then echo ${PROG}: Missing ${release}/dev/MAKEDEV 1>&2 exit 1 @@ -118,9 +126,6 @@ EOF echo "${bar} running MAKEDEV ${bar}" ${HOST_SH} ${release}/dev/MAKEDEV -s all | sed -e 's:^\./:\./dev/:' \ >> "$tmp/selected_sets" - - echo "${bar} creating directories ${bar}" - mkdir ${mnt}/proc ${mnt}/kern } populate() {