diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-10-31 22:19:45 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-10-31 22:19:45 +0100 |
| commit | 78ba0c65b7bf9a64c12ca8c08f2e0220afdc8dbc (patch) | |
| tree | fd9cfb92edfaa37c919be8d24063b8a6c6d94c83 /nixpkgs/pkgs/by-name/lx/lxd-to-incus/d7f7ae55a54437616174f80fb8faa80ae4ffcda4.patch | |
| parent | 7e0c8fe656bbc2fcbdfc3e03a367d2c6ff389769 (diff) | |
| parent | 0cbe9f69c234a7700596e943bfae7ef27a31b735 (diff) | |
| download | nixlib-78ba0c65b7bf9a64c12ca8c08f2e0220afdc8dbc.tar nixlib-78ba0c65b7bf9a64c12ca8c08f2e0220afdc8dbc.tar.gz nixlib-78ba0c65b7bf9a64c12ca8c08f2e0220afdc8dbc.tar.bz2 nixlib-78ba0c65b7bf9a64c12ca8c08f2e0220afdc8dbc.tar.lz nixlib-78ba0c65b7bf9a64c12ca8c08f2e0220afdc8dbc.tar.xz nixlib-78ba0c65b7bf9a64c12ca8c08f2e0220afdc8dbc.tar.zst nixlib-78ba0c65b7bf9a64c12ca8c08f2e0220afdc8dbc.zip | |
Merge commit '0cbe9f69c234a7700596e943bfae7ef27a31b735' into HEAD
Diffstat (limited to 'nixpkgs/pkgs/by-name/lx/lxd-to-incus/d7f7ae55a54437616174f80fb8faa80ae4ffcda4.patch')
| -rw-r--r-- | nixpkgs/pkgs/by-name/lx/lxd-to-incus/d7f7ae55a54437616174f80fb8faa80ae4ffcda4.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/by-name/lx/lxd-to-incus/d7f7ae55a54437616174f80fb8faa80ae4ffcda4.patch b/nixpkgs/pkgs/by-name/lx/lxd-to-incus/d7f7ae55a54437616174f80fb8faa80ae4ffcda4.patch new file mode 100644 index 000000000000..ea3d240da879 --- /dev/null +++ b/nixpkgs/pkgs/by-name/lx/lxd-to-incus/d7f7ae55a54437616174f80fb8faa80ae4ffcda4.patch @@ -0,0 +1,25 @@ +From d7f7ae55a54437616174f80fb8faa80ae4ffcda4 Mon Sep 17 00:00:00 2001 +From: Adam Stephens <adam@valkor.net> +Date: Fri, 27 Oct 2023 13:26:11 -0400 +Subject: [PATCH] lxd-to-incus: query systemd instead of assuming service file + path + +Signed-off-by: Adam Stephens <adam@valkor.net> +--- + cmd/lxd-to-incus/targets.go | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/cmd/lxd-to-incus/targets.go b/cmd/lxd-to-incus/targets.go +index f2b405e0e4..ed84d3ebce 100644 +--- a/cmd/lxd-to-incus/targets.go ++++ b/cmd/lxd-to-incus/targets.go +@@ -25,7 +25,8 @@ func (s *targetSystemd) Present() bool { + return false + } + +- if !util.PathExists("/lib/systemd/system/incus.service") { ++ _, err := subprocess.RunCommand("systemctl", "list-unit-files", "incus.service") ++ if err != nil { + return false + } + |