summaryrefslogtreecommitdiffstats
path: root/release/picobsd/build
diff options
context:
space:
mode:
authorluigi <luigi@FreeBSD.org>2013-09-06 17:19:57 +0000
committerluigi <luigi@FreeBSD.org>2013-09-06 17:19:57 +0000
commitbaf6916d29840d85b2d4a4045219f28bbaa7943c (patch)
treeed1c5e1cd0096ec79f991e1d4c92b499231d5d95 /release/picobsd/build
parent0c8c98d14ef26be4fb8eb751587566399b622d67 (diff)
downloadFreeBSD-src-baf6916d29840d85b2d4a4045219f28bbaa7943c.zip
FreeBSD-src-baf6916d29840d85b2d4a4045219f28bbaa7943c.tar.gz
comment out some stale loader configurations.
Diffstat (limited to 'release/picobsd/build')
-rwxr-xr-xrelease/picobsd/build/picobsd8
1 files changed, 5 insertions, 3 deletions
diff --git a/release/picobsd/build/picobsd b/release/picobsd/build/picobsd
index fa8e90c..1bebc87 100755
--- a/release/picobsd/build/picobsd
+++ b/release/picobsd/build/picobsd
@@ -885,9 +885,11 @@ fill_floppy_image() {
mkdir -p ${dst}/boot/kernel
# 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
- cp -p /boot/loader ${dst}/boot/loader || fail $? no_space "copying bootloader"
+ # 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"
+ (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"
# now transfer the floppy tree. If it is already in mfs, dont bother.
OpenPOWER on IntegriCloud