Page MenuHomeFreeBSD
Files F169711739

D58979.id184530.diff
No OneTemporary
Actions

D58979.id184530.diff
View Options

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
@@ -80,6 +80,11 @@
# Kernel config file to use
NANO_KERNEL=GENERIC
+# XXXJL we can get rid of this variable, however we must see how custom
+# kernels get pkgbase-configured (e.g., kernel.${NANO_KERNEL} when NANO_KERNEL
+# is not GENERIC)? Otherwise, I would prefer to handle them independently, more so
+# because FreeBSD-set-kernels installs a bunch of kernels, and having this variable
+# independently allows us to choose the one we want to boot from.
#
# Boot sub-directory containing kernel and modules
# Custom kernels for pkgbase installations have names like:
@@ -1105,7 +1110,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"
(
@@ -1769,6 +1774,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
Thu, Sep 3, 8:48 AM (48 m, 9 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
36989539
Default Alt Text
D58979.id184530.diff (1 KB)

Event Timeline