Date: Tue, 23 Jun 2015 17:21:30 GMT From: stefano@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287489 - soc2015/stefano/ptnetmap/head/release/picobsd/build Message-ID: <201506231721.t5NHLUjT024898@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: stefano Date: Tue Jun 23 17:21:29 2015 New Revision: 287489 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287489 Log: picobsd: fix loader.conf copy /boot/*.4th and /boot/defaults/loader.conf in the picobsd image to allow the boot loader to read the /boot/loader.conf Modified: soc2015/stefano/ptnetmap/head/release/picobsd/build/picobsd Modified: soc2015/stefano/ptnetmap/head/release/picobsd/build/picobsd ============================================================================== --- soc2015/stefano/ptnetmap/head/release/picobsd/build/picobsd Tue Jun 23 17:21:02 2015 (r287488) +++ soc2015/stefano/ptnetmap/head/release/picobsd/build/picobsd Tue Jun 23 17:21:29 2015 (r287489) @@ -864,7 +864,15 @@ # XXX loader.conf does not work unless we also load the .4th files # echo "hint.acpi.0.disabled=\"1\"" > ${dst}/boot/loader.conf # echo "console=\"comconsole\"" >> ${dst}/boot/loader.conf - local blf="loader* *.4th" # loader.rc loader.4th support.4th" + + mkdir -p ${dst}/boot/defaults + cp -p /boot/*.4th ${dst}/boot/ + cp -p /boot/defaults/loader.conf ${dst}/boot/defaults/loader.conf + + echo "include /boot/loader.4th" > ${dst}/boot/loader.rc + echo "start" >> ${dst}/boot/loader.rc + echo "boot" >> ${dst}/boot/loader.rc + (cd /boot; cp -p loader ${dst}/boot) || fail $? no_space "copying bootloader" cp ${MY_TREE}/floppy.tree/boot/loader.conf ${dst}/boot || true gzip -c kernel > ${dst}/boot/kernel/kernel.gz || fail $? no_space "copying kernel"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506231721.t5NHLUjT024898>