Re: [gentoo-catalyst] [PATCH 1/5] embedded: remove actions that are broken by default

2020-05-21 Thread Daniel Cordero
On Thu, May 21, 2020 at 01:41:18PM -0700, Matt Turner wrote: > So, you must use the embedded target. Could you tell me how you use > it, for what device, etc? I produce mini-systemd tarballs to run under systemd-nspawn (or other container systems). Sometimes, those tarballs can be used as

Re: [gentoo-catalyst] [PATCH 5/5] Allow embedded target to unpack a root_overlay

2020-05-21 Thread Daniel Cordero
On Thu, May 21, 2020 at 01:52:55PM -0700, Matt Turner wrote: > On Thu, May 21, 2020 at 10:34 AM Daniel Cordero > wrote: > > > > From: Daniel Cordero > > > > This was broken due to the previous commit. > > I'm confused. The previous commit didn't break anyt

[gentoo-catalyst] [PATCH 1/5] embedded: remove actions that are broken by default

2020-05-21 Thread Daniel Cordero
From: Daniel Cordero dir_setup() doesn't exist, bootloader() exists but requires specific tools to be installed in the seed stage and doesn't check that they are, causing the build to fail. --- If I have misconstrued the purpose of bootloader, then documentation needs to be written. catalyst

[gentoo-catalyst] [PATCH 3/5] embedded/rm: use destpath to clean mergeroot

2020-05-21 Thread Daniel Cordero
From: Daniel Cordero When using remove() with a capture subpath (e.g. the embedded target), specifying files in rm removes the files from the seed stage, not the captured stage. Use destpath as a base for removals. When not using a subpath, destpath equals chroot_path. Also unhardcode log

[gentoo-catalyst] [PATCH 5/5] Allow embedded target to unpack a root_overlay

2020-05-21 Thread Daniel Cordero
From: Daniel Cordero This was broken due to the previous commit. --- catalyst/targets/embedded.py | 1 + 1 file changed, 1 insertion(+) diff --git a/catalyst/targets/embedded.py b/catalyst/targets/embedded.py index 1b4ad9d6..99739512 100644 --- a/catalyst/targets/embedded.py +++ b/catalyst

[gentoo-catalyst] [PATCH 1/2] catalyst.git: Quote toml paths in custom catalyst.conf

2020-05-29 Thread Daniel Cordero
From: Daniel Cordero With the change to catalyst.conf into TOML format, update the catalyst.git script to quote paths. The / character is not allowed in TOML values unless quoted. fixes: 66e78a8d55d (catalyst: Convert catalyst.conf to TOML) NOTICE : Loading configuration file: /tmp

[gentoo-catalyst] [PATCH 2/2] Add shdir to valid config values

2020-05-29 Thread Daniel Cordero
From: Daniel Cordero The catalyst.git script specified this configuration option, which would not pass validation because shdir was not in the list of valid_config_file_values. Add shdir to the list of allowed valid_config_file_values. Remove shdir from the catalyst.git script anyway

[gentoo-catalyst] [PATCH 2/2] Decompressor uses decompression options

2020-05-29 Thread Daniel Cordero
From: Daniel Cordero If decompressor != compressor, the options given to the programs may not be understood, causing runtime errors. Allow the compression arguments to be overridden in a specfile. Compressor can already be configured with compression_mode. For decompression, while

[gentoo-catalyst] [PATCH 1/2] valid_config_file_values: allow compression_mode

2020-05-29 Thread Daniel Cordero
From: Daniel Cordero Allow overriding compression mode globally from the catalyst config. Otherwise, if one wanted a different compression method than the default, one would need to add compression_mode to every spec file. --- catalyst/defaults.py | 1 + 1 file changed, 1 insertion(+) diff

Re: [gentoo-catalyst] [PATCH 2/2] Decompressor uses decompression options

2020-05-31 Thread Daniel Cordero
On Fri, May 29, 2020 at 07:04:32PM +, Daniel Cordero wrote: > > If decompressor != compressor, the options given to the programs may not > be understood, causing runtime errors. > > Allow the compression arguments to be overridden in a specfile. > Compressor can alr

[gentoo-catalyst] [PATCH 2/3] Update requirements for amd64/x86 ISO creation

2020-10-23 Thread Daniel Cordero
From: Daniel Cordero xorriso uses mkisofs to create the ISO. Signed-off-by: Daniel Cordero --- targets/support/create-iso.sh | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh index ac97ef56..9b1c7185

[gentoo-catalyst] [PATCH 3/3] Build ISO with Joliet directory information

2020-10-23 Thread Daniel Cordero
From: Daniel Cordero Previous syslinux based CDs had this information. Necessary for direct kernel booting with virt-install --location. Fixes: 0a27a7a39a "targets: Use GRUB for BIOS boot" Signed-off-by: Daniel Cordero --- targets/support/create-iso.sh | 1 + 1 file changed, 1

[gentoo-catalyst] [PATCH 1/3] Re-allow the use of mksquashfs to pack the livecd contents

2020-10-23 Thread Daniel Cordero
From: Daniel Cordero sys-fs/squashfs-tools-ng is keyworded as unstable. Stable squashfs users can still use mksquashfs to create the squashed image. Fixes: 23e9ea10 "targets: Use gensquashfs instead of mksquashfs" Signed-off-by: Daniel Cordero --- I have not fixed targets/e

Re: [gentoo-catalyst] [PATCH 3/3] Build ISO with Joliet directory information

2020-10-23 Thread Daniel Cordero
On Fri, Oct 23, 2020 at 09:25:29AM -0700, Matt Turner wrote: > On Fri, Oct 23, 2020 at 2:19 AM Daniel Cordero > wrote: > > > > From: Daniel Cordero > > > > Previous syslinux based CDs had this information. > > Necessary for direct kernel booting with vi

Re: [gentoo-catalyst] [PATCH 2/3] Update requirements for amd64/x86 ISO creation

2020-10-25 Thread Daniel Cordero
On Fri, Oct 23, 2020 at 09:18:44AM +, Daniel Cordero wrote: > xorriso uses mkisofs to create the ISO. Apologies, this statement is incorrect. xorisso does not depend on mkisofs from cdrtools. However, pyDeComp requires isoinfo to create ISO CONTENTS. --- >> Running grub-mkrescue

Re: [gentoo-catalyst] catalyst changes for improving automation

2020-11-03 Thread Daniel Cordero
On Mon, Nov 02, 2020 at 10:44:07PM -0500, Matt Turner wrote: > The catalyst-auto automation scripts live in a repo separate from > catalyst. That increases the difficulty of changing catalyst's > interface, and it doesn't seem to offer any advantages otherwise. > (Keeping build specs in a separate

[gentoo-catalyst] [RFC PATCH] Use a 3 stage livecd build

2020-10-29 Thread Daniel Cordero
From: Daniel Cordero The current (2 stage) livecd process requires a full stage3/4 tarball that can install genkernel and compile a kernel for the livecd. Once the kernel is built, packages are then unmerged to reduce the size of the CD image. This means explicity removing every unnecessary

Re: [gentoo-catalyst] catalyst changes for improving automation

2020-11-04 Thread Daniel Cordero
On Tue, Nov 03, 2020 at 01:19:51PM -0500, Matt Turner wrote: > On Tue, Nov 3, 2020 at 5:56 AM Daniel Cordero wrote: > > > > On Mon, Nov 02, 2020 at 10:44:07PM -0500, Matt Turner wrote: > > > The catalyst-auto automation scripts live in a repo separate from > &

Re: [gentoo-catalyst] [PATCH 11/11] catalyst: Remove update_seed spec option

2021-01-21 Thread Daniel Cordero
On Tue, Jan 19, 2021 at 09:58:15AM -0500, Matt Turner wrote: > On Tue, Jan 19, 2021 at 6:04 AM Daniel Cordero wrote: > > On Mon, Jan 18, 2021 at 03:21:52PM -0500, Matt Turner wrote: > > > There should be no need for custom updates, and if there are exceptional > > > ci

Re: [gentoo-catalyst] [PATCH 11/11] catalyst: Remove update_seed spec option

2021-01-19 Thread Daniel Cordero
On Mon, Jan 18, 2021 at 03:21:52PM -0500, Matt Turner wrote: > There should be no need for custom updates, and if there are exceptional > circumstances the new --enter-chroot option can be used. > There is still a need, and if I'm reading these patches right, --enter-chroot would not satisfy

[gentoo-catalyst] [PATCH] Remove /etc/machine-id in all stages

2021-02-04 Thread Daniel Cordero
From: Daniel Cordero Machine IDs are unique per installation, but if they are retained in a stage tarball, all installations from that stage share the same machine id. Signed-off-by: Daniel Cordero --- catalyst/base/stagebase.py | 1 + 1 file changed, 1 insertion(+) diff --git a/catalyst

[gentoo-catalyst] [PATCH] Clean up chroot directory on success

2021-02-04 Thread Daniel Cordero
From: Daniel Cordero The embedded and livecd-stage2 targets override the action sequence without calling set_completion_action_sequences. This would leave the temporary build environment unpacked on the filesystem. Signed-off-by: Daniel Cordero --- catalyst/targets/embedded.py | 2

[gentoo-catalyst] [PATCH] Allow the use of mksquashfs to pack livecd contents

2021-02-04 Thread Daniel Cordero
From: Daniel Cordero Users using catalyst outside of the portage tree, or on other distributions, may not have the gensquashfs tool. mksquashfs still creates compatible squashfs images for this purpose. Signed-off-by: Daniel Cordero --- targets/support/target_image_setup.sh | 9 +++-- 1

[gentoo-catalyst] [PATCH] distcc: try more combinations of libdir

2021-02-04 Thread Daniel Cordero
From: Daniel Cordero On amd64 (17.1), distcc does not create /usr/lib64/distcc, despite get_libdir returning 'lib64'. Signed-off-by: Daniel Cordero --- targets/support/chroot-functions.sh | 28 1 file changed, 16 insertions(+), 12 deletions(-) diff --git

[gentoo-catalyst] snakeoil-0.9.6 removes FsLock

2021-04-30 Thread Daniel Cordero
snakeoil-0.9.6, which has recently been released and stablised in the tree, removes osutils.FsLock that catalyst uses, causing builds to fail. https://github.com/pkgcore/snakeoil/commit/d7c9c2a40fd6fdf7e62d2f041b7dee3765abbf5f ERROR : CatalystError: Target "stage1" not available. Traceback

Re: [gentoo-catalyst] [PATCH] Add option to generate BSD-style tagged hashes (can be verified by modern coreutils)

2021-03-18 Thread Daniel Cordero
On Wed, Feb 24, 2021 at 10:30:26PM +0100, Andreas K. Hüttel wrote: > --- > catalyst/base/genbase.py | 6 +- > catalyst/defaults.py | 2 ++ > 2 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/catalyst/base/genbase.py b/catalyst/base/genbase.py > index c7dd87bc..52418877

[gentoo-catalyst] [PATCH] Fix specifying target_profiles in repo_name:path format

2021-02-25 Thread Daniel Cordero
From: Daniel Cordero This fixes commit a500400592aaa309 Signed-off-by: Daniel Cordero --- catalyst/base/stagebase.py | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index a4da7eb3..448d6265 100644

Re: [gentoo-catalyst] [PATCH 4/4] stage4/groups: improve log message

2022-04-21 Thread Daniel Cordero
On Thu, Apr 21, 2022 at 07:08:26AM +, Daniel Cordero wrote: > When creating a user with no additional groups, don't print a misleading > message > saying the user will be created with an equals sign in the username. > --- > catalyst/base/stagebase.py | 2 +- > 1 file ch

[gentoo-catalyst] [PATCH 3/4] stage4/users: don't split a single entry

2022-04-21 Thread Daniel Cordero
A single entry in users is one user who could have multiple groups. --- catalyst/base/stagebase.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 7e6b9e32..d4875491 100644 --- a/catalyst/base/stagebase.py +++

[gentoo-catalyst] [PATCH 4/4] stage4/groups: improve log message

2022-04-21 Thread Daniel Cordero
When creating a user with no additional groups, don't print a misleading message saying the user will be created with an equals sign in the username. --- catalyst/base/stagebase.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalyst/base/stagebase.py

[gentoo-catalyst] [PATCH 1/4] stage4: fix handling of groups, users and keys

2022-04-21 Thread Daniel Cordero
Previously, the set_*() functions would always set the result of the toml parsing as the setting. Instead, only override it if it is a string. This fixes an issue introduced in commit 5be6069bcbd5a7fa3f114f28366597bc5ddbb891. --- catalyst/base/stagebase.py | 6 +++--- 1 file changed, 3

[gentoo-catalyst] [PATCH 2/4] stage4/groups: don't run split on a list

2022-04-21 Thread Daniel Cordero
"groups" has been normalised into a list and does not have a split() method. This fixes an issue introduced in commit 5be6069bcbd5a7fa3f114f28366597bc5ddbb891. --- catalyst/base/stagebase.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalyst/base/stagebase.py

Re: [gentoo-catalyst] [PATCH 1/3] catalyst: support 3 new options

2022-04-19 Thread Daniel Cordero
On Sun, Mar 27, 2022 at 04:37:10PM -0700, Matt Turner wrote: > From: Patrice Clement > > * stage4/groups: create a a list of groups. > * stage4/users: create a list of users. users can also be added to > groups using the "foo.bar=wheel,audio,baz" format. > * stage4/ssh_public_keys: copy an SSH

Re: [gentoo-catalyst] [PATCH 1/3] catalyst: support 3 new options

2022-04-19 Thread Daniel Cordero
On Sun, Mar 27, 2022 at 04:37:10PM -0700, Matt Turner wrote: > From: Patrice Clement > > * stage4/groups: create a a list of groups. > * stage4/users: create a list of users. users can also be added to > groups using the "foo.bar=wheel,audio,baz" format. > * stage4/ssh_public_keys: copy an SSH

[gentoo-catalyst] [PATCH] create-iso.sh: split iso-level arguments

2022-04-19 Thread Daniel Cordero
From: Daniel Cordero When enclosed in quotes and expanded with "${variable[@]}", the word is expanded to be a single argument, rather than two separate arguments. i.e. argv[2] = "-iso-level 3" instead of argv[2] = "-iso-level" argv[3] = "3" This

Re: [gentoo-catalyst] [PATCH 1/4] stage4: fix handling of groups, users and keys

2022-05-12 Thread Daniel Cordero
erge_requests/1 > > Could you provide your Signed-off-by tag? Signed-off-by: Daniel Cordero > > I've pointed Patrice to the MR so he can review. >

[gentoo-catalyst] [PATCH v2 4/4] stage4/users: improve log message

2022-05-09 Thread Daniel Cordero
When creating a user with no additional groups, don't print a misleading message saying the user will be created with an equals sign in the username. --- catalyst/base/stagebase.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/catalyst/base/stagebase.py