Patchwork systemd: fix ordering for machineid and run-postinsts services

login
register
mail settings
Submitter Jonathan Liu
Date May 16, 2013, 2:59 a.m.
Message ID <1368673187-20121-1-git-send-email-net147@gmail.com>
Download mbox | patch
Permalink /patch/49973/
State Accepted
Commit 8b59ec4eb761d88445da94bb90aa2c5db0bbf365
Headers show

Comments

Jonathan Liu - May 16, 2013, 2:59 a.m.
The remount-rootfs.service unit has been renamed to
systemd-remount-fs.service in systemd v183 and later.

The run-postinsts script writes to /var/log (a symbolic link to
/var/volatile/log), so systemd-tmpfiles-setup.service is added to After=
in run-postinsts.service to ensure /var/volatile/log is created before
running the script.

[YOCTO #4490]

Signed-off-by: Jonathan Liu <net147@gmail.com>
---
 meta/recipes-core/systemd/systemd-compat-units/machineid.service     | 2 +-
 meta/recipes-core/systemd/systemd-compat-units/run-postinsts.service | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Jonathan Liu - May 24, 2013, 1:33 p.m.
On 16/05/2013 12:59 PM, Jonathan Liu wrote:
> The remount-rootfs.service unit has been renamed to
> systemd-remount-fs.service in systemd v183 and later.
>
> The run-postinsts script writes to /var/log (a symbolic link to
> /var/volatile/log), so systemd-tmpfiles-setup.service is added to After=
> in run-postinsts.service to ensure /var/volatile/log is created before
> running the script.
>
> [YOCTO #4490]
>
> Signed-off-by: Jonathan Liu <net147@gmail.com>
> ---
>   meta/recipes-core/systemd/systemd-compat-units/machineid.service     | 2 +-
>   meta/recipes-core/systemd/systemd-compat-units/run-postinsts.service | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-core/systemd/systemd-compat-units/machineid.service b/meta/recipes-core/systemd/systemd-compat-units/machineid.service
> index cab8f76..f586c6d 100644
> --- a/meta/recipes-core/systemd/systemd-compat-units/machineid.service
> +++ b/meta/recipes-core/systemd/systemd-compat-units/machineid.service
> @@ -2,7 +2,7 @@
>   Description=Machine ID first boot configure
>   DefaultDependencies=no
>   ConditionPathExists=|!/etc/machine-id
> -After=remount-rootfs.service
> +After=systemd-remount-fs.service
>   Before=sysinit.target
>   
>   [Service]
> diff --git a/meta/recipes-core/systemd/systemd-compat-units/run-postinsts.service b/meta/recipes-core/systemd/systemd-compat-units/run-postinsts.service
> index da6fe76..02c1d86 100644
> --- a/meta/recipes-core/systemd/systemd-compat-units/run-postinsts.service
> +++ b/meta/recipes-core/systemd/systemd-compat-units/run-postinsts.service
> @@ -2,7 +2,7 @@
>   Description=Run pending postinsts
>   DefaultDependencies=no
>   ConditionPathExists=|/etc/rcS.d/S98run-postinsts
> -After=remount-rootfs.service tmp.mount
> +After=systemd-remount-fs.service systemd-tmpfiles-setup.service tmp.mount
>   Before=sysinit.target
>   
>   [Service]
Bump. This fixes the postinst service failing on startup when using 
systemd with an image that inherits from boot-directdisk.

Regards,
Jonathan

Patch

diff --git a/meta/recipes-core/systemd/systemd-compat-units/machineid.service b/meta/recipes-core/systemd/systemd-compat-units/machineid.service
index cab8f76..f586c6d 100644
--- a/meta/recipes-core/systemd/systemd-compat-units/machineid.service
+++ b/meta/recipes-core/systemd/systemd-compat-units/machineid.service
@@ -2,7 +2,7 @@ 
 Description=Machine ID first boot configure
 DefaultDependencies=no
 ConditionPathExists=|!/etc/machine-id
-After=remount-rootfs.service
+After=systemd-remount-fs.service
 Before=sysinit.target
 
 [Service]
diff --git a/meta/recipes-core/systemd/systemd-compat-units/run-postinsts.service b/meta/recipes-core/systemd/systemd-compat-units/run-postinsts.service
index da6fe76..02c1d86 100644
--- a/meta/recipes-core/systemd/systemd-compat-units/run-postinsts.service
+++ b/meta/recipes-core/systemd/systemd-compat-units/run-postinsts.service
@@ -2,7 +2,7 @@ 
 Description=Run pending postinsts
 DefaultDependencies=no
 ConditionPathExists=|/etc/rcS.d/S98run-postinsts
-After=remount-rootfs.service tmp.mount
+After=systemd-remount-fs.service systemd-tmpfiles-setup.service tmp.mount
 Before=sysinit.target
 
 [Service]