[OE-core] [PATCH] systemd-compat-units: drop machineid.service

[Koen Kooi]

Op 12 dec. 2013, om 11:04 heeft Ross Burton <ross.burton at intel.com> het volgende geschreven:

> systemd will create the machine ID automatically if it isn't set,

That's not the whole story, it will generate a new one every boot

> so this unit doesn't serve any purpose.

That's correct, you need to generate it offline, since /etc/machine-id is a bind mount after booting :(


> Signed-off-by: Ross Burton <ross.burton at intel.com>
> ---
> meta/recipes-core/systemd/systemd-compat-units.bb      |    4 ----
> .../systemd/systemd-compat-units/machineid.service     |   16 ----------------
> 2 files changed, 20 deletions(-)
> delete mode 100644 meta/recipes-core/systemd/systemd-compat-units/machineid.service
> 
> diff --git a/meta/recipes-core/systemd/systemd-compat-units.bb b/meta/recipes-core/systemd/systemd-compat-units.bb
> index 6eb5ffd..e4d93d2 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 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
> -- 
> 1.7.10.4
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>