Patchwork [meta-oe] systemd: create empty machine-id to fix first boot failures

login
register
mail settings
Submitter Koen Kooi
Date April 14, 2012, 2:09 p.m.
Message ID <1334412572-19597-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/25831/
State Accepted
Commit 397dba1ab21184317019e9808a3cc36e61050680
Headers show

Comments

Koen Kooi - April 14, 2012, 2:09 p.m.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta-oe/recipes-core/systemd/systemd_git.bb |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
Denys Dmytriyenko - April 14, 2012, 4:13 p.m.
On Sat, Apr 14, 2012 at 04:09:32PM +0200, Koen Kooi wrote:
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

Acked-by: Denys Dmytriyenko <denys@ti.com>

> ---
>  meta-oe/recipes-core/systemd/systemd_git.bb |    6 +++++-
>  1 files changed, 5 insertions(+), 1 deletions(-)
> 
> diff --git a/meta-oe/recipes-core/systemd/systemd_git.bb b/meta-oe/recipes-core/systemd/systemd_git.bb
> index b23e5f5..f4ca72a 100644
> --- a/meta-oe/recipes-core/systemd/systemd_git.bb
> +++ b/meta-oe/recipes-core/systemd/systemd_git.bb
> @@ -14,7 +14,7 @@ inherit gitpkgv
>  PKGV = "v${GITPKGVTAG}"
>  
>  PV = "git"
> -PR = "r26"
> +PR = "r27"
>  
>  inherit useradd pkgconfig autotools vala perlnative
>  
> @@ -64,6 +64,10 @@ do_install() {
>  
>  	# create dir for journal
>  	install -d ${D}${localstatedir}/log/journal
> +
> +	# create machine-id
> +	# 20:12 < mezcalero> koen: you have three options: a) run systemd-machine-id-setup at install time, b) have / read-only and an empty file there (for stateless) and c) boot with / writable
> +	touch ${D}${sysconfdir}/machine-id
>  }
>  
>  python populate_packages_prepend (){
> -- 
> 1.7.2.5
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Patch

diff --git a/meta-oe/recipes-core/systemd/systemd_git.bb b/meta-oe/recipes-core/systemd/systemd_git.bb
index b23e5f5..f4ca72a 100644
--- a/meta-oe/recipes-core/systemd/systemd_git.bb
+++ b/meta-oe/recipes-core/systemd/systemd_git.bb
@@ -14,7 +14,7 @@  inherit gitpkgv
 PKGV = "v${GITPKGVTAG}"
 
 PV = "git"
-PR = "r26"
+PR = "r27"
 
 inherit useradd pkgconfig autotools vala perlnative
 
@@ -64,6 +64,10 @@  do_install() {
 
 	# create dir for journal
 	install -d ${D}${localstatedir}/log/journal
+
+	# create machine-id
+	# 20:12 < mezcalero> koen: you have three options: a) run systemd-machine-id-setup at install time, b) have / read-only and an empty file there (for stateless) and c) boot with / writable
+	touch ${D}${sysconfdir}/machine-id
 }
 
 python populate_packages_prepend (){