소스 검색

Revert "systemd: ensure tmpfiles.d/legacy.conf is installed"

legacy.conf no longer exists, it's now legacy.conf.in that has to be
preprocessed. The preprocessing is only done if sysv-compat is enabled.

This reverts commit 0e71f5111988fe57531d1c84bdf631f1932b14bc.
Arnout Vandecappelle (Essensium/Mind) 3 년 전
부모
커밋
2fc0d98699
1개의 변경된 파일1개의 추가작업 그리고 9개의 파일을 삭제
  1. 1 9
      package/systemd/systemd.mk

+ 1 - 9
package/systemd/systemd.mk

@@ -563,17 +563,9 @@ define SYSTEMD_INSTALL_MACHINEID_HOOK
 	touch $(TARGET_DIR)/etc/machine-id
 endef
 
-# systemd doesn't install legacy.conf without sysv-compat
-# This config ensures /var/lock is created
-define SYSTEMD_INSTALL_LEGACY_CONF_HOOK
-	$(INSTALL) -D -m 0644 $(@D)/tmpfiles.d/legacy.conf \
-		$(TARGET_DIR)/usr/lib/tmpfiles.d
-endef
-
 SYSTEMD_POST_INSTALL_TARGET_HOOKS += \
 	SYSTEMD_INSTALL_INIT_HOOK \
-	SYSTEMD_INSTALL_MACHINEID_HOOK \
-	SYSTEMD_INSTALL_LEGACY_CONF_HOOK
+	SYSTEMD_INSTALL_MACHINEID_HOOK
 
 define SYSTEMD_INSTALL_IMAGES_CMDS
 	$(SYSTEMD_INSTALL_BOOT_FILES)