socsvn commit: r286230 - soc2015/stefano/picobsd/head/release/picobsd/build

[stefano at FreeBSD.org]

Author: stefano
Date: Wed May 27 13:00:30 2015
New Revision: 286230
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=286230

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/picobsd/head/release/picobsd/build/picobsd

Modified: soc2015/stefano/picobsd/head/release/picobsd/build/picobsd
==============================================================================
--- soc2015/stefano/picobsd/head/release/picobsd/build/picobsd	Wed May 27 12:58:22 2015	(r286229)
+++ soc2015/stefano/picobsd/head/release/picobsd/build/picobsd	Wed May 27 13:00:30 2015	(r286230)
@@ -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"