diff options
Diffstat (limited to 'meta/recipes-core/systemd/systemd-conf_242.bb')
-rw-r--r-- | meta/recipes-core/systemd/systemd-conf_242.bb | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/meta/recipes-core/systemd/systemd-conf_242.bb b/meta/recipes-core/systemd/systemd-conf_242.bb index 9bb27fd96d..7fe2e1105b 100644 --- a/meta/recipes-core/systemd/systemd-conf_242.bb +++ b/meta/recipes-core/systemd/systemd-conf_242.bb | |||
@@ -7,14 +7,13 @@ DefaultTimeoutStartSec setting." | |||
7 | 7 | ||
8 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 8 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
9 | 9 | ||
10 | CONFFILES_${PN} = "${sysconfdir}/machine-id \ | 10 | CONFFILES_${PN} = "${sysconfdir}/systemd/coredump.conf \ |
11 | ${sysconfdir}/systemd/coredump.conf \ | ||
12 | ${sysconfdir}/systemd/journald.conf \ | 11 | ${sysconfdir}/systemd/journald.conf \ |
13 | ${sysconfdir}/systemd/logind.conf \ | 12 | ${sysconfdir}/systemd/logind.conf \ |
14 | ${sysconfdir}/systemd/system.conf \ | 13 | ${sysconfdir}/systemd/system.conf \ |
15 | ${sysconfdir}/systemd/user.conf" | 14 | ${sysconfdir}/systemd/user.conf" |
16 | 15 | ||
17 | FILES_${PN} = "${sysconfdir}/machine-id ${sysconfdir}/systemd" | 16 | FILES_${PN} = "${sysconfdir}/systemd" |
18 | 17 | ||
19 | do_configure[noexec] = '1' | 18 | do_configure[noexec] = '1' |
20 | do_compile[noexec] = '1' | 19 | do_compile[noexec] = '1' |
@@ -23,10 +22,6 @@ do_install() { | |||
23 | rm -rf ${D}/${sysconfdir}/systemd | 22 | rm -rf ${D}/${sysconfdir}/systemd |
24 | install -d ${D}/${sysconfdir}/systemd | 23 | install -d ${D}/${sysconfdir}/systemd |
25 | 24 | ||
26 | # Create machine-id | ||
27 | # 20:12 < mezcalero> koen: you have three options: a) run systemd-machine-id-setup at install time, b) have / read-only and an empty file there (for stateless) and c) boot with / writable | ||
28 | touch ${D}${sysconfdir}/machine-id | ||
29 | |||
30 | install -m 0644 ${S}/src/coredump/coredump.conf ${D}${sysconfdir}/systemd/coredump.conf | 25 | install -m 0644 ${S}/src/coredump/coredump.conf ${D}${sysconfdir}/systemd/coredump.conf |
31 | 26 | ||
32 | install -m 0644 ${S}/src/journal/journald.conf ${D}${sysconfdir}/systemd/journald.conf | 27 | install -m 0644 ${S}/src/journal/journald.conf ${D}${sysconfdir}/systemd/journald.conf |