aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jordan <immoloism@gmail.com>2024-07-30 19:10:35 +0000
committerBen Kohler <bkohler@gentoo.org>2024-08-22 13:36:09 -0500
commitdcddbe165464c0c0054e1985d8e3ee8b612960ae (patch)
tree212fb3121d2905166f14a12cc63fe98bc6750992 /releases/specs
parentamd64 installcd-min.spec: Convert to dist-kernel (diff)
downloadreleng-dcddbe165464c0c0054e1985d8e3ee8b612960ae.tar.gz
releng-dcddbe165464c0c0054e1985d8e3ee8b612960ae.tar.bz2
releng-dcddbe165464c0c0054e1985d8e3ee8b612960ae.zip
amd64 admincd: Add dist kernel support
Enable dist kernel support on admincd Signed-off-by: Ian Jordan <immoloism@gmail.com> Closes: https://github.com/gentoo/releng/pull/22 Signed-off-by: Ben Kohler <bkohler@gentoo.org>
Diffstat (limited to 'releases/specs')
-rw-r--r--releases/specs/amd64/hardened/admincd-stage2.spec9
1 files changed, 5 insertions, 4 deletions
diff --git a/releases/specs/amd64/hardened/admincd-stage2.spec b/releases/specs/amd64/hardened/admincd-stage2.spec
index 35ab2021..8b6778f9 100644
--- a/releases/specs/amd64/hardened/admincd-stage2.spec
+++ b/releases/specs/amd64/hardened/admincd-stage2.spec
@@ -11,13 +11,13 @@ livecd/bootargs: dokeymap
livecd/fstype: squashfs
livecd/iso: admincd-amd64-@TIMESTAMP@.iso
livecd/type: gentoo-release-minimal
-livecd/volid: Gentoo amd64 AdminCD @TIMESTAMP@
+livecd/volid: Gentoo-amd64-AdminCD-@TIMESTAMP@
boot/kernel: gentoo
-boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/amd64/amd64-6.6.30.config
-
+boot/kernel/gentoo/distkernel: yes
+boot/kernel/gentoo/dracut_args: --xz --no-hostonly -a dmsquash-live -a mdraid -o btrfs -o crypt -o i18n -o usrmount -o lunmask -o qemu -o qemu-net -o nvdimm -o multipath -i /lib/keymaps /lib/keymaps -I busybox
+boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/DK/amd64/livecd-amd64.config
boot/kernel/gentoo/packages: --usepkg n zfs zfs-kmod broadcom-sta
livecd/unmerge:
@@ -71,6 +71,7 @@ livecd/empty:
/etc/cron.hourly
/etc/cron.monthly
/etc/cron.weekly
+ /etc/kernel/config.d
/etc/logrotate.d
/etc/modules.autoload.d
/etc/runlevels/single