summaryrefslogtreecommitdiff
path: root/meta/recipes-core/systemd
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-12-18 16:20:05 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-18 17:06:58 +0000
commit8e6da3d8973777d9b651d085e06ee20a761ed62c (patch)
tree2d42a1ed352b9c18f0a5db5d8e88cdbca7f92624 /meta/recipes-core/systemd
parentdfcd8f2a6f5847d735755c1644c4c93be4fbb3e8 (diff)
downloadopenembedded-core-8e6da3d8973777d9b651d085e06ee20a761ed62c.tar.gz
openembedded-core-8e6da3d8973777d9b651d085e06ee20a761ed62c.tar.bz2
openembedded-core-8e6da3d8973777d9b651d085e06ee20a761ed62c.zip
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. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd')
-rw-r--r--meta/recipes-core/systemd/systemd-compat-units.bb4
-rw-r--r--meta/recipes-core/systemd/systemd-compat-units/machineid.service16
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() {
install -m 0644 ${WORKDIR}/run-postinsts.service ${D}${systemd_unitdir}/system
ln -sf ../run-postinsts.service ${D}${systemd_unitdir}/system/basic.target.wants/
ln -sf ../run-postinsts.service ${D}${systemd_unitdir}/system/sysinit.target.wants/
-
- install -m 0644 ${WORKDIR}/machineid.service ${D}${systemd_unitdir}/system
- ln -sf ../machineid.service ${D}${systemd_unitdir}/system/sysinit.target.wants/
- ln -sf ../machineid.service ${D}${systemd_unitdir}/system/basic.target.wants/
}
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 @@
-[Unit]
-Description=Machine ID first boot configure
-DefaultDependencies=no
-ConditionPathExists=|!/etc/machine-id
-After=systemd-remount-fs.service
-Before=sysinit.target
-
-[Service]
-ExecStart=/bin/systemd-machine-id-setup
-RemainAfterExit=No
-Type=oneshot
-StandardOutput=syslog
-
-[Install]
-WantedBy=basic.target
-WantedBy=sysinit.target