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

switchroot: Ensure /run/ostree-booted is created even without initramfs #1508

Closed
wants to merge 1 commit into from

Conversation

cgwalters
Copy link
Member

See https://mail.gnome.org/archives/ostree-list/2018-March/msg00012.html

If ostree-prepare-root is run as pid 1 (i.e we're not using an initramfs), then
anything we write outside the target sysroot (such as /run/ostree-booted) will
be lost.

Since ostree-remount.service runs fairly early in boot, and is triggered via
ConditionKernelCommandLine=ostree, we can just touch the file there in
addition.

See https://mail.gnome.org/archives/ostree-list/2018-March/msg00012.html

If ostree-prepare-root is run as pid 1 (i.e we're not using an initramfs), then
anything we write outside the target sysroot (such as `/run/ostree-booted`) will
be lost.

Since `ostree-remount.service` runs fairly early in boot, and is triggered via
`ConditionKernelCommandLine=ostree`, we can just touch the file there in
addition.
@cgwalters
Copy link
Member Author

@rh-atomic-bot delegate=akiernan

@rh-atomic-bot
Copy link

✌️ @akiernan can now approve this pull request

@akiernan
Copy link
Contributor

@rh-atomic-bot r+ 001e843

@rh-atomic-bot
Copy link

⌛ Testing commit 001e843 with merge 173a313...

rh-atomic-bot pushed a commit that referenced this pull request Mar 22, 2018
See https://mail.gnome.org/archives/ostree-list/2018-March/msg00012.html

If ostree-prepare-root is run as pid 1 (i.e we're not using an initramfs), then
anything we write outside the target sysroot (such as `/run/ostree-booted`) will
be lost.

Since `ostree-remount.service` runs fairly early in boot, and is triggered via
`ConditionKernelCommandLine=ostree`, we can just touch the file there in
addition.

Closes: #1508
Approved by: akiernan
@rh-atomic-bot
Copy link

💔 Test failed - status-atomicjenkins

@cgwalters
Copy link
Member Author

cgwalters commented Mar 22, 2018 via email

@rh-atomic-bot
Copy link

⌛ Testing commit 001e843 with merge 2203067...

rh-atomic-bot pushed a commit that referenced this pull request Mar 22, 2018
See https://mail.gnome.org/archives/ostree-list/2018-March/msg00012.html

If ostree-prepare-root is run as pid 1 (i.e we're not using an initramfs), then
anything we write outside the target sysroot (such as `/run/ostree-booted`) will
be lost.

Since `ostree-remount.service` runs fairly early in boot, and is triggered via
`ConditionKernelCommandLine=ostree`, we can just touch the file there in
addition.

Closes: #1508
Approved by: akiernan
@rh-atomic-bot
Copy link

💔 Test failed - status-atomicjenkins

@cgwalters
Copy link
Member Author

OK, fix for that flake is in #1509

@cgwalters
Copy link
Member Author

@rh-atomic-bot retry

@rh-atomic-bot
Copy link

⌛ Testing commit 001e843 with merge 38cf31f...

@rh-atomic-bot
Copy link

☀️ Test successful - status-atomicjenkins
Approved by: akiernan
Pushing 38cf31f to master...

cgwalters added a commit to cgwalters/ostree that referenced this pull request Mar 22, 2018
A quick turnaround to include one PR: ostreedev#1508
"switchroot: Ensure /run/ostree-booted is created even without initramfs"

This fixes ostree when booting without an initramfs.  Thanks to @akiernan for the
bug report and helping review the fix!  I'm working on enhancing
the test suite, which will help in adding some coverage here.

Also for this release I'm going to avoid adding a "stub" symbol section
to the `-released.sym` file; I don't believe it's necessary.
@cgwalters cgwalters mentioned this pull request Mar 22, 2018
rh-atomic-bot pushed a commit that referenced this pull request Mar 22, 2018
A quick turnaround to include one PR: #1508
"switchroot: Ensure /run/ostree-booted is created even without initramfs"

This fixes ostree when booting without an initramfs.  Thanks to @akiernan for the
bug report and helping review the fix!  I'm working on enhancing
the test suite, which will help in adding some coverage here.

Also for this release I'm going to avoid adding a "stub" symbol section
to the `-released.sym` file; I don't believe it's necessary.

Closes: #1512
Approved by: jlebon
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