Rewrite syschdemd #126
Rewrite syschdemd #126
Conversation
| , util-linux | ||
| , defaultUser | ||
| , automountPath | ||
| , |
scripts/syschdemd.nix
Outdated
| , | ||
| }: | ||
| let | ||
| writeShellScript = |
There was a problem hiding this comment.
This shadows a function in nixpkgs https://github.com/NixOS/nixpkgs/blob/master/pkgs/build-support/trivial-builders.nix#L213
There was a problem hiding this comment.
Renamed to mkWrappedScript.
scripts/syschdemd.sh
Outdated
| /bin/sh -c "cd \"$PWD\"; $exportCmd; source /etc/set-environment; exec $command" | ||
| } | ||
|
|
||
| main "$@" |
There was a problem hiding this comment.
I just reformatted the whole thing with shfmt.
There was a problem hiding this comment.
Just for my interest: What settings are you using? Maybe we should document that somewhere to not reformat files multiple times. I am always using shfmt -ci -i 2 -s -w $FILE.
There was a problem hiding this comment.
I did add it as a check in CI.
| #!/usr/bin/env bash | ||
| set -euo pipefail | ||
|
|
||
| [ "${NIXOS_WSL_DEBUG:-}" == "1" ] && set -x |
There was a problem hiding this comment.
| [ "${NIXOS_WSL_DEBUG:-}" == "1" ] && set -x | |
| [[ -v NIXOS_WSL_DEBUG ]] && set -x |
testing if it is set to anything maybe makes it easier if people accidentally use true
K900
force-pushed
the
refactor
branch
2 times, most recently
from
596e8ba
to
e3b87ea
Compare
|
Docker Desktop is broken, because the |
|
Other than that, everything seems to be working |
|
I tried adding it to the outside script, can you see if that works? |
K900
force-pushed
the
refactor
branch
2 times, most recently
from
b4a504c
to
819b815
Compare
That does not seem to work. The volume shows up as an empty directory inside the container |
|
I am very confused by how the mounts work then. Can you run |
|
|
|
Is this from inside the namespace or outside? |
|
The command output is from inside the systemd namespace, but not the docker container. Outside the systemd namespace it looks like this: |
|
This is also a problem for other mounts created inside the namespace: I have a tmpfs on /tmp in my NixOS installation (with the current syschdemd). Because of that any files in /tmp can't be accessed from outside it (e.g. through SMB with the explorer or interop) and trying to use interop in there results in a not at all helpful error: When I made the docker-desktop fix, I also tried removing mount namespacing completely, but that means that the namespace and the ouside have the same |
|
Can you try the latest commit? I think unshare was just doing a weird. |
|
The latest commit seems to be broken |
|
Forgot to remove the other thing. Can you try it now? |
|
Seems to be working now |
Mostly just a big pile of cleanups. Important changes: - refactor and clean up the code, fix all the shellcheck complaints - stop trying to guess paths in scripts and wrap them correctly instead - use nsfs instead of trying to figure out the right PID to copy namespaces from - clean up $WSLPATH to remove extra impure entries - don't try to restart systemd if it died - make sure the store is read-only before we do anything, so systemd can't mess with it - reformat shell scripts with shfmt
|
Squashed, should be good to go now. |
Mostly just a big pile of cleanups.
Important changes: