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

qubes 4.0rc4 and init refactoring #327

Closed
wants to merge 4 commits into from
Closed

Conversation

flammit
Copy link
Collaborator

@flammit flammit commented Feb 25, 2018

No description provided.

flammit and others added 4 commits February 19, 2018 14:29
if "CONFIG_TPM=y" is not present in the config file, functionalities
needing TPM could be disabled, while leaving other functionalities intact.

This will make Heads a more general-usage bootloader payload atop coreboot.
Guarded linuxboot specific init entries
Removed Makefile entries into separate file (conflicts with srcing /etc/config)
Added CONFIG_BOOT_LOCAL/_REMOTE to control interface setup
Fixed CONFIG_TPM usage
@flammit flammit changed the title qubes 4.0rc4, kgpe-d16 and init refactoring qubes 4.0rc4 and init refactoring Feb 25, 2018
@flammit
Copy link
Collaborator Author

flammit commented Feb 25, 2018

Split out the KGPE-D16 support to another branch

@flammit flammit mentioned this pull request Feb 28, 2018
@osresearch
Copy link
Collaborator

The qubes part of this PR is no longer relevant after fixing #227, right?

I'm hesitant on the split of boards/$(BOARD).config and .mk since it makes for more files that have to be tracked and possibly maintained in sync. What do you think about a way to generate the /etc/config file from all of the $(CONFIG_.*) variables?

export | grep '^CONFIG_' almost works, except that most of these configs are not exported.

@flammit
Copy link
Collaborator Author

flammit commented Feb 28, 2018

Yup the qubes isn't needed now and the export way to get /etc/config SGTM. Let me know if you need me to fix.

@osresearch
Copy link
Collaborator

I've pushed a fix that generates /etc/config from the environment: 4f5432b

What else needs to be merged from this PR? I think the TPM fixes went in as part of merging #293

@flammit
Copy link
Collaborator Author

flammit commented Feb 28, 2018

Just the initrd/init changes, but as long as it looks like #331 in the end, it should be fine to close / ignore this PR.

mount /sys/firmware/efi/efivars

# Setup the pty psudeo filesystem
mkdir /dev/pts
Copy link
Collaborator

Choose a reason for hiding this comment

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

What's wrong with always mounting /dev/pts?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Mmm... CONFIG_UNIX98_PTYS=y isn't always built in the kernel so mounting devpts can fail but I guess that's not awful (added CONFIG_LINUX_PTY in board config in PR #331).

tpm extend -ix 4 -ic recovery
exec /bin/ash
# Now it is safe to print a banner
if [ ! -z "$CONFIG_LINUXBOOT" ]; then
Copy link
Collaborator

Choose a reason for hiding this comment

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

In my recent export CONFIG_* commit I didn't export the linuxboot config. Do you think it is important to be able to distinguish them?

Also, [ ! -z "$CONFIG_LINUXBOOT" ] will go down this path if CONFIG_LINUXBOOT=n. It is better to test against y.

# just in case...
tpm extend -ix 4 -ic recovery
exec /bin/ash
# Setup remote attestation interface
Copy link
Collaborator

Choose a reason for hiding this comment

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

The network setup should move to a separate setup file, rather than living here in /init.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Fine by me - I just wanted minimal equal functionality changes to what you had done for linuxboot.

@flammit
Copy link
Collaborator Author

flammit commented Feb 28, 2018

If it makes sense, I can just rebase/refactor #327, #330 and #331 to current master and incorporate all your comments.

@flammit flammit closed this Mar 1, 2018
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.

2 participants