From 97eb7d0c131feb060a6f55fffbcda8a82c9b5bb1 Mon Sep 17 00:00:00 2001 From: Norbert Lange Date: Sun, 9 Jan 2022 12:01:30 +0100 Subject: [PATCH] package/skeleton-init-systemd: support /var/lock again systemd's own configuration file is not installed anymore, as side effect of disabling sysv support in commit 96f0d9969e6220154b39d9d80cda97998d41f670. Add the legacy.conf functionality back in skeleton-init-systemd, since this is a buildroot feature to support software expecting these directories to exist, as well as trying to be similar to other init systems. Create our own legacy.conf instead of using the one from upstream, because: - upstream has legacy.conf.in which has to be preprocessed; - we don't want to enable upstream's full sysv support as explained in commit 96f0d9969e6220154b39d9d80cda97998d41f670; - we would probably need to post-process upstream's legacy.conf anyway since it doesn't fully match with buildroot expectations. Signed-off-by: Norbert Lange Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/skeleton-init-systemd/legacy.conf | 7 +++++++ package/skeleton-init-systemd/skeleton-init-systemd.mk | 1 + 2 files changed, 8 insertions(+) create mode 100644 package/skeleton-init-systemd/legacy.conf diff --git a/package/skeleton-init-systemd/legacy.conf b/package/skeleton-init-systemd/legacy.conf new file mode 100644 index 0000000000..0a5393408c --- /dev/null +++ b/package/skeleton-init-systemd/legacy.conf @@ -0,0 +1,7 @@ +# Create legacy directories for buildroot +# This is a subset of systemd's legacy.conf + +d /run/lock 0755 root root - +d /run/lock/subsys 0755 root root - + +L /var/lock - - - - ../run/lock diff --git a/package/skeleton-init-systemd/skeleton-init-systemd.mk b/package/skeleton-init-systemd/skeleton-init-systemd.mk index 5d6b716f7a..1e212cc2f7 100644 --- a/package/skeleton-init-systemd/skeleton-init-systemd.mk +++ b/package/skeleton-init-systemd/skeleton-init-systemd.mk @@ -62,6 +62,7 @@ define SKELETON_INIT_SYSTEMD_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/srv mkdir -p $(TARGET_DIR)/var ln -s ../run $(TARGET_DIR)/var/run + install -D -m644 $(SKELETON_INIT_SYSTEMD_PKGDIR)/legacy.conf $(TARGET_DIR)/usr/lib/tmpfiles.d/legacy.conf $(SKELETON_INIT_SYSTEMD_ROOT_RO_OR_RW) endef