Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

implement this same as maybe_boot_clouseau #4960

Merged
merged 1 commit into from
Jan 10, 2024
Merged

Conversation

rnewson
Copy link
Member

@rnewson rnewson commented Jan 10, 2024

refinement of #4957 to match maybe_boot_clouseau.

@rnewson rnewson changed the title implement this same as boot_haproxy et al implement this same as maybe_boot_clouseau Jan 10, 2024
@rnewson
Copy link
Member Author

rnewson commented Jan 10, 2024

I'm also questioning whether 4957 did anything as I already had a check for this at the top of boot_nouveau:

def boot_nouveau(ctx):
    if not ctx["with_nouveau"]:
        return

testing locally ./dev/lib/nouveau.yaml is not created when doing dev/run unless you also add --with-nouveau

@jiahuili430
Copy link
Contributor

jiahuili430 commented Jan 10, 2024

If nouveau.yaml does not exist in the rel directory, then generate_nouveau_config(ctx) will get FileNotFoundError.
So, I added an if statement to check whether the `nouveau' was enabled.

@rnewson
Copy link
Member Author

rnewson commented Jan 10, 2024

I think your testing was based on the PR during its development. The merged version had the

if not ctx["with_nouveau"]:
        return

check in it. As such I think the work in #4957 didn't do anything for the merged version of this work?

Anyway, it makes sense to match the clouseau approach anyway.

@rnewson rnewson merged commit 50e1d16 into main Jan 10, 2024
14 checks passed
@rnewson rnewson deleted the fix-dev-run-setup-config-2 branch January 10, 2024 23:47
Copy link
Contributor

@nickva nickva left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

@nickva
Copy link
Contributor

nickva commented Jan 11, 2024

Hmm, it would be nice to default to --with-nouveau if we already configured nouveau. I'll see if we can read the install.mk and pick up the dev/run defaults from there perhaps?

@rnewson
Copy link
Member Author

rnewson commented Jan 11, 2024

enh, just you ./configure'd with --enable-nouveau doesn't mean you always want to launch it with dev/run, but I guess as a default it makes sense. I'm just used to setting both each time that it doesn't bother me. see how we handle haproxy also

@nickva
Copy link
Contributor

nickva commented Jan 11, 2024

I tried it here #4961, but needed also a way to explicitly disable nouveau during some tests which didn't expect it (mango, etc), so it would need an extra --without-nouveau argument, and that was getting a bit too clunky.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants