1 |
commit: 40a807ce427ae32887f60fe62013c7b3843f8e7e |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 26 19:49:52 2018 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 26 20:21:52 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40a807ce |
7 |
|
8 |
sys-apps/systemd: keepdir /etc/udev/{hwdb.d,rules.d} |
9 |
|
10 |
Bug: https://bugs.gentoo.org/645844 |
11 |
Package-Manager: Portage-2.3.19_p11, Repoman-2.3.6_p45 |
12 |
|
13 |
sys-apps/systemd/systemd-236-r5.ebuild | 7 ++++--- |
14 |
sys-apps/systemd/systemd-9999.ebuild | 7 ++++--- |
15 |
2 files changed, 8 insertions(+), 6 deletions(-) |
16 |
|
17 |
diff --git a/sys-apps/systemd/systemd-236-r5.ebuild b/sys-apps/systemd/systemd-236-r5.ebuild |
18 |
index 961530f55ed..4156ce618fe 100644 |
19 |
--- a/sys-apps/systemd/systemd-236-r5.ebuild |
20 |
+++ b/sys-apps/systemd/systemd-236-r5.ebuild |
21 |
@@ -313,9 +313,10 @@ multilib_src_install_all() { |
22 |
fi |
23 |
|
24 |
# Preserve empty dirs in /etc & /var, bug #437008 |
25 |
- keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \ |
26 |
- /etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd \ |
27 |
- /var/log/journal/remote |
28 |
+ keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d} |
29 |
+ keepdir /etc/systemd/{ntp-units.d,user} /var/lib/systemd |
30 |
+ keepdir /etc/udev/{hwdb.d,rules.d} |
31 |
+ keepdir /var/log/journal/remote |
32 |
|
33 |
# Symlink /etc/sysctl.conf for easy migration. |
34 |
dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf |
35 |
|
36 |
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild |
37 |
index 7e7bcf41a44..36144514e86 100644 |
38 |
--- a/sys-apps/systemd/systemd-9999.ebuild |
39 |
+++ b/sys-apps/systemd/systemd-9999.ebuild |
40 |
@@ -312,9 +312,10 @@ multilib_src_install_all() { |
41 |
fi |
42 |
|
43 |
# Preserve empty dirs in /etc & /var, bug #437008 |
44 |
- keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \ |
45 |
- /etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd \ |
46 |
- /var/log/journal/remote |
47 |
+ keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d} |
48 |
+ keepdir /etc/systemd/{ntp-units.d,user} /var/lib/systemd |
49 |
+ keepdir /etc/udev/{hwdb.d,rules.d} |
50 |
+ keepdir /var/log/journal/remote |
51 |
|
52 |
# Symlink /etc/sysctl.conf for easy migration. |
53 |
dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf |