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>

diff --git a/meta/recipes-core/systemd/systemd-compat-units.bb b/meta/recipes-core/systemd/systemd-compat-units.bb
index 6eb5ffd985f4f4af02bae42a18aa789e397b66fb..e4d93d2c88fd17f00eeb171fb56d923eb9ff392d 100644 (file)
--- 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 (file)
index f586c6d..0000000
--- 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