Skip to content

nixos/filesystems: condition mount-pstore.service on unmounted /sys/fs/pstore (once more)#124148

Merged
symphorien merged 1 commit intorelease-21.05from
unknown repository
May 23, 2021
Merged

nixos/filesystems: condition mount-pstore.service on unmounted /sys/fs/pstore (once more)#124148
symphorien merged 1 commit intorelease-21.05from
unknown repository

Conversation

@ghost
Copy link

@ghost ghost commented May 23, 2021

backport of #123902.

@ghost
Copy link
Author

ghost commented May 23, 2021

@symphorien Here we go.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels May 23, 2021
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels May 23, 2021
@symphorien
Copy link
Member

The manual https://nixos.org/manual/nixpkgs/stable/#submitting-changes-stable-release-branches requests that you cherry-pick with -x for traceability.

nixos/filesystems: condition mount-pstore.service on unmounted /sys/fs/pstore

(cherry picked from commit d755573)

Reason: activation throws an error from failing to start the unit
@ghost
Copy link
Author

ghost commented May 23, 2021

Thanks! The whole merge parent thing had me a bit tripped up.

@symphorien symphorien merged commit bfa9bc3 into NixOS:release-21.05 May 23, 2021
@symphorien
Copy link
Member

thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant