Page MenuHomeFreeBSD

D58979.diff
No OneTemporary

D58979.diff

diff --git a/tools/tools/nanobsd/defaults.sh b/tools/tools/nanobsd/defaults.sh
--- a/tools/tools/nanobsd/defaults.sh
+++ b/tools/tools/nanobsd/defaults.sh
@@ -1107,7 +1107,7 @@
# Install a precompiled kernel from pkgbase packages or distribution tarballs
install_precompiled_kernel() {
- pprint 2 "install precompiled kernel (GENERIC)"
+ pprint 2 "install precompiled kernel (${NANO_KERNEL})"
pprint 3 "log: ${NANO_LOG}/_.ik"
(
@@ -1772,6 +1772,27 @@
NANO_METALOG=${NANO_OBJ}/_.metalog
fi
+ # Adjust pkgbase kernel names
+ if $do_precompiled && [ -z "$NANO_NOPKGBASE" ]; then
+ for package in $NANO_PKGBASE_LIST; do
+ case "$package" in
+ FreeBSD-kernel-*)
+ kernel="${package#FreeBSD-kernel-generic-}"
+ case "$kernel" in
+ mmccam*)
+ NANO_KERNEL="GENERIC-MMCCAM"
+ NANO_LOADER_KERNEL="kernel.GENERIC-MMCCAM"
+ ;;
+ nodebug*)
+ NANO_KERNEL="GENERIC-NODEBUG"
+ NANO_LOADER_KERNEL="kernel.GENERIC-NODEBUG"
+ ;;
+ esac
+ ;;
+ esac
+ done
+ fi
+
#
# Keep legacy sizes in 512-byte sectors, except for variables
# in this file, which require sizes in bytes

File Metadata

Mime Type
text/plain
Expires
Sat, Sep 5, 2:25 PM (19 m, 41 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37047247
Default Alt Text
D58979.diff (1 KB)

Event Timeline