From aa44407b296c29df38fad3ecc4abb9ec93a9b26a Mon Sep 17 00:00:00 2001 From: silas jeon Date: Wed, 18 Jan 2017 14:42:13 +0900 Subject: [PATCH] Remove etc tmpfile generation as they are unused To support read-only root filesystem, there should be nothing modified on /etc. Also these five files in /etc are handled by other packages as below. So these are removed. os-release : tizen-release localtime : tzdata mtab : setup nsswitch.conf : glibc pam.d : pam Change-Id: I0dc490ddf6d299d956504405419e6c5d71e52a97 --- Makefile.am | 3 +-- packaging/systemd.spec | 1 - tmpfiles.d/etc.conf.m4 | 21 --------------------- 3 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 tmpfiles.d/etc.conf.m4 diff --git a/Makefile.am b/Makefile.am index 95a4f81..1018afe 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2518,8 +2518,7 @@ nodist_systemunit_DATA += \ units/systemd-tmpfiles-clean.service nodist_tmpfiles_DATA = \ - tmpfiles.d/systemd.conf \ - tmpfiles.d/etc.conf + tmpfiles.d/systemd.conf dist_tmpfiles_DATA = \ tmpfiles.d/systemd-nologin.conf \ diff --git a/packaging/systemd.spec b/packaging/systemd.spec index 970545f..73be1f8 100755 --- a/packaging/systemd.spec +++ b/packaging/systemd.spec @@ -520,7 +520,6 @@ fi %{_prefix}/lib/systemd/user-generators/systemd-dbus1-generator %endif %{_prefix}/lib/systemd/system-generators/systemd-system-update-generator -%{_prefix}/lib/tmpfiles.d/etc.conf %{_prefix}/lib/tmpfiles.d/home.conf %{_prefix}/lib/tmpfiles.d/journal-nocow.conf %{_prefix}/lib/tmpfiles.d/legacy.conf diff --git a/tmpfiles.d/etc.conf.m4 b/tmpfiles.d/etc.conf.m4 deleted file mode 100644 index c01f3fd..0000000 --- a/tmpfiles.d/etc.conf.m4 +++ /dev/null @@ -1,21 +0,0 @@ -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. - -# See tmpfiles.d(5) for details - -L /etc/os-release - - - - ../usr/lib/os-release -L /etc/localtime - - - - ../usr/share/zoneinfo/UTC -m4_ifdef(`HAVE_SMACK_RUN_LABEL', -t /etc/mtab - - - - security.SMACK64=_ -)m4_dnl -m4_ifdef(`ENABLE_RESOLVED', -L! /etc/resolv.conf - - - - ../usr/lib/systemd/resolv.conf -)m4_dnl -C /etc/nsswitch.conf - - - - -m4_ifdef(`HAVE_PAM', -C /etc/pam.d - - - - -)m4_dnl -- 2.7.4