diff options
author | Ross Burton <ross.burton@intel.com> | 2013-12-18 16:20:05 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-18 17:08:07 +0000 |
commit | 1047f680110d876097a2b0add9845a0edf620599 (patch) | |
tree | 5fbd9a1506addf269406861c74b5d2b1cfb52109 /meta/recipes-core | |
parent | 3d6d5d78479e5703180f5230cf24c335c20a4689 (diff) | |
download | poky-1047f680110d876097a2b0add9845a0edf620599.tar.gz |
systemd-compat-units: drop machineid.service
systemd will create the machine ID automatically if it isn't set, so this unit
doesn't serve any purpose.
(From OE-Core rev: 8e6da3d8973777d9b651d085e06ee20a761ed62c)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/systemd/systemd-compat-units.bb | 4 | ||||
-rw-r--r-- | meta/recipes-core/systemd/systemd-compat-units/machineid.service | 16 |
2 files changed, 0 insertions, 20 deletions
diff --git a/meta/recipes-core/systemd/systemd-compat-units.bb b/meta/recipes-core/systemd/systemd-compat-units.bb index 6eb5ffd985..e4d93d2c88 100644 --- a/meta/recipes-core/systemd/systemd-compat-units.bb +++ b/meta/recipes-core/systemd/systemd-compat-units.bb | |||
@@ -19,10 +19,6 @@ do_install() { | |||
19 | install -m 0644 ${WORKDIR}/run-postinsts.service ${D}${systemd_unitdir}/system | 19 | install -m 0644 ${WORKDIR}/run-postinsts.service ${D}${systemd_unitdir}/system |
20 | ln -sf ../run-postinsts.service ${D}${systemd_unitdir}/system/basic.target.wants/ | 20 | ln -sf ../run-postinsts.service ${D}${systemd_unitdir}/system/basic.target.wants/ |
21 | ln -sf ../run-postinsts.service ${D}${systemd_unitdir}/system/sysinit.target.wants/ | 21 | ln -sf ../run-postinsts.service ${D}${systemd_unitdir}/system/sysinit.target.wants/ |
22 | |||
23 | install -m 0644 ${WORKDIR}/machineid.service ${D}${systemd_unitdir}/system | ||
24 | ln -sf ../machineid.service ${D}${systemd_unitdir}/system/sysinit.target.wants/ | ||
25 | ln -sf ../machineid.service ${D}${systemd_unitdir}/system/basic.target.wants/ | ||
26 | } | 22 | } |
27 | 23 | ||
28 | SYSTEMD_DISABLED_SYSV_SERVICES = " \ | 24 | SYSTEMD_DISABLED_SYSV_SERVICES = " \ |
diff --git a/meta/recipes-core/systemd/systemd-compat-units/machineid.service b/meta/recipes-core/systemd/systemd-compat-units/machineid.service deleted file mode 100644 index f586c6d60f..0000000000 --- a/meta/recipes-core/systemd/systemd-compat-units/machineid.service +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | [Unit] | ||
2 | Description=Machine ID first boot configure | ||
3 | DefaultDependencies=no | ||
4 | ConditionPathExists=|!/etc/machine-id | ||
5 | After=systemd-remount-fs.service | ||
6 | Before=sysinit.target | ||
7 | |||
8 | [Service] | ||
9 | ExecStart=/bin/systemd-machine-id-setup | ||
10 | RemainAfterExit=No | ||
11 | Type=oneshot | ||
12 | StandardOutput=syslog | ||
13 | |||
14 | [Install] | ||
15 | WantedBy=basic.target | ||
16 | WantedBy=sysinit.target | ||