From: Ross Burton Date: Wed, 18 Dec 2013 16:20:05 +0000 (+0000) Subject: systemd-compat-units: drop machineid.service X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~35077 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e6da3d8973777d9b651d085e06ee20a761ed62c;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-core/systemd/systemd-compat-units.bb b/meta/recipes-core/systemd/systemd-compat-units.bb index 6eb5ffd985f..e4d93d2c88f 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 f586c6d60fc..00000000000 --- 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