Skip to content

Commit

Permalink
Merge #1551
Browse files Browse the repository at this point in the history
1551: nixops check: Fix false positive: run-initramfs.mount r=roberth a=roberth



Co-authored-by: Robert Hensing <robert@roberthensing.nl>
  • Loading branch information
bors[bot] and roberth authored Jan 3, 2023
2 parents 91b125b + 19e9544 commit 5013072
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
2 changes: 2 additions & 0 deletions integration-tests/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ let
deployer_do("cd ~/unicorn; nixops deploy --confirm")
deployer_do("cd ~/unicorn; nixops ssh server 'hello | figlet'")
deployer_do("cd ~/unicorn; nixops check")
'';
});

Expand Down
7 changes: 6 additions & 1 deletion nixops/backends/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,12 @@ def _check(self, res):

if match:
unit = match.group(1)
isSystemMount = unit.startswith("sys-") or unit.startswith("dev-")

isSystemMount = (
unit.startswith("sys-")
or unit.startswith("dev-")
or unit == "run-initramfs.mount"
)
isBuiltinMount = unit == "tmp.mount" or unit == "home.mount"

if not isSystemMount and not isBuiltinMount:
Expand Down

0 comments on commit 5013072

Please sign in to comment.