Include more systemd units in the tarball

Dockerfile

@@ -54,6 +54,9 @@ RUN set -ex; \
 	mkdir -p /usr/local/lib/podman; \
 	mv bin/rootlessport /usr/local/lib/podman/rootlessport; \
 	! ldd /usr/local/lib/podman/rootlessport
+# install systemd units to /systemd instead of /usr/local/lib/systemd to avoid copying potentially other units into the tar archive
+RUN set -eux; \
+	make install.systemd BUILDTAGS='systemd' LIBDIR=
 # copying completions to /comp instead of /usr/local/share to avoid copying potentially other unwanted stuff in the final stage
 RUN set -eux; \
 	install -Dm644 -t /comp/bash-completion/completions/ completions/bash/podman; \
@@ -84,6 +87,8 @@ RUN git clone -c 'advice.detachedHead=false' --depth=1 --branch=$NETAVARK_VERSIO
 WORKDIR /netavark
 ENV RUSTFLAGS='-C link-arg=-s'
 RUN cargo build --release
+# install systemd units to /systemd instead of /usr/local/lib/systemd to avoid copying potentially other units into the tar archive
+RUN make install.systemd-units SYSTEMDDIR=/systemd
 
 
 # aardvark-dns
@@ -207,6 +212,8 @@ COPY --from=aardvark-dns /aardvark-dns/target/release/aardvark-dns /usr/local/li
 COPY --from=podman /etc/containers/seccomp.json /etc/containers/seccomp.json
 
 FROM podmanall AS tar-archive
+COPY --from=netavark /netavark/contrib/systemd/system /usr/local/lib/systemd/system/
 COPY --from=podman /usr/local/libexec/podman/quadlet /usr/local/libexec/podman/quadlet
+COPY --from=podman /systemd/ /usr/local/lib/systemd/
 
 FROM podmanall

Makefile

@@ -108,10 +108,6 @@ install:
 
 tar: .podman-from-container
 	rm -f $(ASSET_DIR).tar.gz
-	install -Dm644 -t $(ASSET_DIR)/usr/local/lib/systemd/system \
-		conf/systemd/{podman-restart.service,podman.service,podman.socket}
-	install -Dm644 -t $(ASSET_DIR)/usr/local/lib/systemd/user \
-		conf/systemd/{podman-restart.service,podman.service,podman.socket}
 	tar -C $(ASSET_DIR)/.. -czvf $(ASSET_DIR).tar.gz $(ASSET_NAME)
 
 .podman-from-container: IMAGE_ROOTFS = $(BUILD_DIR)/images/podman/linux_$(ARCH)

README.md

@@ -146,7 +146,7 @@ Next, remove all the copied binaries and support files from the following folder
 sudo rm -rf /etc/containers/*
 sudo rm -rf /usr/local/bin/{crun,fuse-overlayfs,fusermount3,pasta,pasta.avx2,podman,runc}
 sudo rm -rf /usr/local/{lib,libexec}/podman
-sudo rm -rf /usr/local/lib/systemd/{system,user}/podman*
+sudo rm -rf /usr/local/lib/systemd/{system,user}/{netavark,podman}*
 sudo rm /usr/local/lib/systemd/{system,user}-generators/podman-*-generator
 sudo rm /usr/local/share/{bash-completion/completions/podman,zsh/site-functions/_podman,fish/vendor_completions.d/podman.fish}
 ```