diff options
| author |   Ian Jordan <immoloism@gmail.com> | 2024-07-30 18:27:34 +0000 |
|---|---|---|
| committer |   Ben Kohler <bkohler@gentoo.org> | 2024-08-22 13:39:53 -0500 |
| commit | 836744689e0cc09a1a0a89b7272142d5dfb99bd4 (patch) | |
| tree | bfd9ce494addef84b4ee8d19e68abf8ecc23ff74 /catalyst/base | |
| parent | arch: add x86.i686-t64 subarch definition with appropriate *FLAGS (diff) | |
| download | catalyst-836744689e0cc09a1a0a89b7272142d5dfb99bd4.tar.gz catalyst-836744689e0cc09a1a0a89b7272142d5dfb99bd4.tar.bz2 catalyst-836744689e0cc09a1a0a89b7272142d5dfb99bd4.zip | |
Add Dist-kernel kconfig support
Based on the orginal patch by oldfashionedcow to add the abilty for
a user to set a custom kconfig for their livecd to be moved to
/etc/kernel/config.d/ before sys-kernel/gentoo-kernel is emerged.
Syntax is the same as the one used for Genkernel kconfigs.
Closes: https://bugs.gentoo.org/936676
Co-authored-by: Rahul Sandh <rahul@sandhuservices.dev>
Co-authored-by: Christopher Fore <csfore@posteo.net>
Signed-off-by: Ian Jordan <immoloism@gmail.com>
Closes: https://github.com/gentoo/catalyst/pull/21
Signed-off-by: Ben Kohler <bkohler@gentoo.org>
Diffstat (limited to 'catalyst/base')
| -rw-r--r-- | catalyst/base/stagebase.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index a23b1d90..8a3d2af6 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -1707,8 +1707,13 @@ class StageBase(TargetBase, ClearBase, GenBase): raise CatalystError("Can't find kernel config: %s" % self.settings[key]) - shutil.copy(self.settings[key], - self.settings['chroot_path'] + '/var/tmp/' + kname + '.config') + if "boot/kernel/" + kname + "/distkernel" in self.settings: + os.makedirs(self.settings['chroot_path'] + '/etc//kernel/config.d') + shutil.copy(self.settings[key], + self.settings['chroot_path'] + '/etc//kernel/config.d') + else: + shutil.copy(self.settings[key], + self.settings['chroot_path'] + '/var/tmp/' + kname + '.config') def _copy_initramfs_overlay(self, kname): key = 'boot/kernel/' + kname + '/initramfs_overlay' |