diff mbox series

expand-on-first-boot: Fix broken syntax

Message ID 3d319203-f9ea-4193-8454-db580cfd7680@siemens.com
State Accepted, archived
Headers show
Series expand-on-first-boot: Fix broken syntax | expand

Commit Message

Jan Kiszka Aug. 31, 2024, 8:52 a.m. UTC 
From: Jan Kiszka <jan.kiszka@siemens.com>

There must be only one path per ConditionPathIsReadWrite statement, or
the two of them will be interpreted as one, and the condition is never
met.

Fixes: 6e2974df ("expand-on-first-boot: Add /tmp to ConditionPathIsReadWrite")
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 .../expand-on-first-boot/files/expand-on-first-boot.service    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Uladzimir Bely Sept. 4, 2024, 8:23 a.m. UTC | #1 
On Sat, 2024-08-31 at 10:52 +0200, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> There must be only one path per ConditionPathIsReadWrite statement,
> or
> the two of them will be interpreted as one, and the condition is
> never
> met.
> 
> Fixes: 6e2974df ("expand-on-first-boot: Add /tmp to
> ConditionPathIsReadWrite")
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>  .../expand-on-first-boot/files/expand-on-first-boot.service    | 3
> ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-support/expand-on-first-boot/files/expand-
> on-first-boot.service b/meta/recipes-support/expand-on-first-
> boot/files/expand-on-first-boot.service
> index 9daae719..58f4b55b 100644
> --- a/meta/recipes-support/expand-on-first-boot/files/expand-on-
> first-boot.service
> +++ b/meta/recipes-support/expand-on-first-boot/files/expand-on-
> first-boot.service
> @@ -9,7 +9,8 @@ DefaultDependencies=no
>  Conflicts=shutdown.target
>  After=systemd-remount-fs.service
>  Before=local-fs-pre.target shutdown.target
> -ConditionPathIsReadWrite=/etc /tmp
> +ConditionPathIsReadWrite=/etc
> +ConditionPathIsReadWrite=/tmp
>  
>  [Service]
>  Type=oneshot

Applied to next, thanks.
diff mbox series

Patch

diff --git a/meta/recipes-support/expand-on-first-boot/files/expand-on-first-boot.service b/meta/recipes-support/expand-on-first-boot/files/expand-on-first-boot.service
index 9daae719..58f4b55b 100644
--- a/meta/recipes-support/expand-on-first-boot/files/expand-on-first-boot.service
+++ b/meta/recipes-support/expand-on-first-boot/files/expand-on-first-boot.service
@@ -9,7 +9,8 @@  DefaultDependencies=no
 Conflicts=shutdown.target
 After=systemd-remount-fs.service
 Before=local-fs-pre.target shutdown.target
-ConditionPathIsReadWrite=/etc /tmp
+ConditionPathIsReadWrite=/etc
+ConditionPathIsReadWrite=/tmp
 
 [Service]
 Type=oneshot