Merge pull request #167208 from devplayer0/fix/missing-systemd-nspawn-options

nixos/systemd/nspawn: Add missing nspawn unit options
main
Sandro 2 years ago committed by GitHub
commit 836c52e625
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      nixos/modules/system/boot/systemd/nspawn.nix

@ -16,7 +16,7 @@ let
"LimitNOFILE" "LimitAS" "LimitNPROC" "LimitMEMLOCK" "LimitLOCKS" "LimitNOFILE" "LimitAS" "LimitNPROC" "LimitMEMLOCK" "LimitLOCKS"
"LimitSIGPENDING" "LimitMSGQUEUE" "LimitNICE" "LimitRTPRIO" "LimitRTTIME" "LimitSIGPENDING" "LimitMSGQUEUE" "LimitNICE" "LimitRTPRIO" "LimitRTTIME"
"OOMScoreAdjust" "CPUAffinity" "Hostname" "ResolvConf" "Timezone" "OOMScoreAdjust" "CPUAffinity" "Hostname" "ResolvConf" "Timezone"
"LinkJournal" "LinkJournal" "Ephemeral" "AmbientCapability"
]) ])
(assertValueOneOf "Boot" boolValues) (assertValueOneOf "Boot" boolValues)
(assertValueOneOf "ProcessTwo" boolValues) (assertValueOneOf "ProcessTwo" boolValues)
@ -26,11 +26,13 @@ let
checkFiles = checkUnitConfig "Files" [ checkFiles = checkUnitConfig "Files" [
(assertOnlyFields [ (assertOnlyFields [
"ReadOnly" "Volatile" "Bind" "BindReadOnly" "TemporaryFileSystem" "ReadOnly" "Volatile" "Bind" "BindReadOnly" "TemporaryFileSystem"
"Overlay" "OverlayReadOnly" "PrivateUsersChown" "Overlay" "OverlayReadOnly" "PrivateUsersChown" "BindUser"
"Inaccessible" "PrivateUserOwnership"
]) ])
(assertValueOneOf "ReadOnly" boolValues) (assertValueOneOf "ReadOnly" boolValues)
(assertValueOneOf "Volatile" (boolValues ++ [ "state" ])) (assertValueOneOf "Volatile" (boolValues ++ [ "state" ]))
(assertValueOneOf "PrivateUsersChown" boolValues) (assertValueOneOf "PrivateUsersChown" boolValues)
(assertValueOneOf "PrivateUserOwnership" [ "off" "chown" "map" "auto" ])
]; ];
checkNetwork = checkUnitConfig "Network" [ checkNetwork = checkUnitConfig "Network" [

Loading…
Cancel
Save