From owner-svn-soc-all@freebsd.org  Tue Jul 21 14:10:23 2015
Return-Path: <owner-svn-soc-all@freebsd.org>
Delivered-To: svn-soc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id AFAF39A5E52
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Tue, 21 Jul 2015 14:10:23 +0000 (UTC)
 (envelope-from stefano@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A07D01597
 for <svn-soc-all@FreeBSD.org>; Tue, 21 Jul 2015 14:10:23 +0000 (UTC)
 (envelope-from stefano@FreeBSD.org)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id t6LEANg9067570
 for <svn-soc-all@FreeBSD.org>; Tue, 21 Jul 2015 14:10:23 GMT
 (envelope-from stefano@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t6LEAN8O067568
 for svn-soc-all@FreeBSD.org; Tue, 21 Jul 2015 14:10:23 GMT
 (envelope-from stefano@FreeBSD.org)
Date: Tue, 21 Jul 2015 14:10:23 GMT
Message-Id: <201507211410.t6LEAN8O067568@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 stefano@FreeBSD.org using -f
From: stefano@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r288616 - in soc2015/stefano/ptnetmap/stable/10: .
 release/picobsd/build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jul 2015 14:10:23 -0000

Author: stefano
Date: Tue Jul 21 14:10:22 2015
New Revision: 288616
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=288616

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/stable/10/   (props changed)
  soc2015/stefano/ptnetmap/stable/10/release/picobsd/build/picobsd

Modified: soc2015/stefano/ptnetmap/stable/10/release/picobsd/build/picobsd
==============================================================================
--- soc2015/stefano/ptnetmap/stable/10/release/picobsd/build/picobsd	Tue Jul 21 14:02:48 2015	(r288615)
+++ soc2015/stefano/ptnetmap/stable/10/release/picobsd/build/picobsd	Tue Jul 21 14:10:22 2015	(r288616)
@@ -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"