[PATCH] image-postproc-extension: empty mechine-id

[PATCH] image-postproc-extension: empty mechine-id

[Su, Bao Cheng]

From: Su Bao Cheng <baocheng.su@siemens.com>
Date: Thu, 4 Jul 2019 15:52:17 +0800
Subject: [PATCH] image-postproc-extension: empty mechine-id
To: isar-users@googlegroups.com

According to manpage of debian machine-id @
https://manpages.debian.org/buster/systemd/machine-id.5.en.html,
/etc/machine-id should be empty instead of removing.

Also according to above manpage, the dbus machine-id is copied to
/etc/machine-id if systemd machine-id is empty. However, the dbus
machine-id is also created during isar building, which stays the same
for every machine using the same image.

So here instead of removing, empty this file, and the mechine id will
be regenerated at the first boot. Also remove the dbus machine-id to
prevent copying.

Signed-off-by: Su Bao Cheng <baocheng.su@siemens.com>
---
 meta/classes/image-postproc-extension.bbclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/classes/image-postproc-extension.bbclass b/meta/classes/image-postproc-extension.bbclass
index 495eae6..96f5ad6 100644
--- a/meta/classes/image-postproc-extension.bbclass
+++ b/meta/classes/image-postproc-extension.bbclass
@@ -49,5 +49,7 @@ image_postprocess_mark() {
 ROOTFS_POSTPROCESS_COMMAND =+ "image_postprocess_machine_id"
 image_postprocess_machine_id() {
     # systemd(1) takes care of recreating the machine-id on first boot
+    sudo rm -f '${IMAGE_ROOTFS}/var/lib/dbus/machine-id'
     sudo rm -f '${IMAGE_ROOTFS}/etc/machine-id'
+    sudo install -m 644 '/dev/null' '${IMAGE_ROOTFS}/etc/machine-id'
 }
-- 
2.17.1

Re: [PATCH] image-postproc-extension: empty mechine-id

[Claudius Heine]

Hi,

On 08/07/2019 05.37, [ext] Su, Bao Cheng wrote:
> 
> From: Su Bao Cheng <baocheng.su@siemens.com>
> Date: Thu, 4 Jul 2019 15:52:17 +0800
> Subject: [PATCH] image-postproc-extension: empty mechine-id
> To: isar-users@googlegroups.com
> 
> According to manpage of debian machine-id @
> https://manpages.debian.org/buster/systemd/machine-id.5.en.html,
> /etc/machine-id should be empty instead of removing.
> 
> Also according to above manpage, the dbus machine-id is copied to
> /etc/machine-id if systemd machine-id is empty. However, the dbus
> machine-id is also created during isar building, which stays the same
> for every machine using the same image.

Good catch!

> 
> So here instead of removing, empty this file, and the mechine id will
> be regenerated at the first boot. Also remove the dbus machine-id to
> prevent copying.
> 
> Signed-off-by: Su Bao Cheng <baocheng.su@siemens.com>
> ---
>   meta/classes/image-postproc-extension.bbclass | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/meta/classes/image-postproc-extension.bbclass b/meta/classes/image-postproc-extension.bbclass
> index 495eae6..96f5ad6 100644
> --- a/meta/classes/image-postproc-extension.bbclass
> +++ b/meta/classes/image-postproc-extension.bbclass
> @@ -49,5 +49,7 @@ image_postprocess_mark() {
>   ROOTFS_POSTPROCESS_COMMAND =+ "image_postprocess_machine_id"
>   image_postprocess_machine_id() {
>       # systemd(1) takes care of recreating the machine-id on first boot
> +    sudo rm -f '${IMAGE_ROOTFS}/var/lib/dbus/machine-id'
>       sudo rm -f '${IMAGE_ROOTFS}/etc/machine-id'
> +    sudo install -m 644 '/dev/null' '${IMAGE_ROOTFS}/etc/machine-id'

You could probably just replace the `sudo rm ...machine-id` with that 
line, since `install` would overwrite the content, so removing it would 
not be necessary.

Otherwise LGTM

regards,
Claudius


>   }
> 

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: ch@denx.de

RE: [PATCH] image-postproc-extension: empty mechine-id

[Su, Bao Cheng]

> -----Original Message-----
> From: Heine, Claudius (ext) (CT RDA IOT SES-DE)
> Sent: Monday, July 08, 2019 2:48 PM
> To: Su, Bao Cheng (RC-CN DI FA R&D SW); isar-users@googlegroups.com
> Cc: Kiszka, Jan (CT RDA IOT SES-DE); ch@denx.de
> Subject: Re: [PATCH] image-postproc-extension: empty mechine-id
> 
> Hi,
> 
> On 08/07/2019 05.37, [ext] Su, Bao Cheng wrote:
> >
> > From: Su Bao Cheng <baocheng.su@siemens.com>
> > Date: Thu, 4 Jul 2019 15:52:17 +0800
> > Subject: [PATCH] image-postproc-extension: empty mechine-id
> > To: isar-users@googlegroups.com
> >
> > According to manpage of debian machine-id @
> > https://manpages.debian.org/buster/systemd/machine-id.5.en.html,
> > /etc/machine-id should be empty instead of removing.
> >
> > Also according to above manpage, the dbus machine-id is copied to
> > /etc/machine-id if systemd machine-id is empty. However, the dbus
> > machine-id is also created during isar building, which stays the same
> > for every machine using the same image.
> 
> Good catch!
> 
> >
> > So here instead of removing, empty this file, and the mechine id will
> > be regenerated at the first boot. Also remove the dbus machine-id to
> > prevent copying.
> >
> > Signed-off-by: Su Bao Cheng <baocheng.su@siemens.com>
> > ---
> >   meta/classes/image-postproc-extension.bbclass | 2 ++
> >   1 file changed, 2 insertions(+)
> >
> > diff --git a/meta/classes/image-postproc-extension.bbclass
> > b/meta/classes/image-postproc-extension.bbclass
> > index 495eae6..96f5ad6 100644
> > --- a/meta/classes/image-postproc-extension.bbclass
> > +++ b/meta/classes/image-postproc-extension.bbclass
> > @@ -49,5 +49,7 @@ image_postprocess_mark() {
> >   ROOTFS_POSTPROCESS_COMMAND =+ "image_postprocess_machine_id"
> >   image_postprocess_machine_id() {
> >       # systemd(1) takes care of recreating the machine-id on first
> > boot
> > +    sudo rm -f '${IMAGE_ROOTFS}/var/lib/dbus/machine-id'
> >       sudo rm -f '${IMAGE_ROOTFS}/etc/machine-id'
> > +    sudo install -m 644 '/dev/null' '${IMAGE_ROOTFS}/etc/machine-id'
> 
> You could probably just replace the `sudo rm ...machine-id` with that line, since `install` would overwrite the content, so removing it would
> not be necessary.
> 
> Otherwise LGTM
> 
> regards,
> Claudius
> 
> 
> >   }
> >
> 
> --
> DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
> Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: ch@denx.de

Please see the revision:

From: Su Bao Cheng <baocheng.su@siemens.com>
Date: Thu, 4 Jul 2019 15:52:17 +0800
Subject: [PATCH] image-postproc-extension: empty mechine-id
To: isar-users@googlegroups.com

According to manpage of debian machine-id @
https://manpages.debian.org/buster/systemd/machine-id.5.en.html,
/etc/machine-id should be empty instead of removing.

Also according to above manpage, the dbus machine-id is copied to
/etc/machine-id if systemd machine-id is empty. However, the dbus
machine-id is also created during isar building, which stays the same
for every machine using the same image.

So here instead of removing, empty this file, and the mechine id will
be regenerated at the first boot. Also remove the dbus machine-id to
prevent copying.

Signed-off-by: Su Bao Cheng <baocheng.su@siemens.com>
---
 meta/classes/image-postproc-extension.bbclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/classes/image-postproc-extension.bbclass b/meta/classes/image-postproc-extension.bbclass
index 495eae6..3f7b73b 100644
--- a/meta/classes/image-postproc-extension.bbclass
+++ b/meta/classes/image-postproc-extension.bbclass
@@ -49,5 +49,6 @@ image_postprocess_mark() {
 ROOTFS_POSTPROCESS_COMMAND =+ "image_postprocess_machine_id"
 image_postprocess_machine_id() {
     # systemd(1) takes care of recreating the machine-id on first boot
-    sudo rm -f '${IMAGE_ROOTFS}/etc/machine-id'
+    sudo rm -f '${IMAGE_ROOTFS}/var/lib/dbus/machine-id'
+    sudo install -m 644 '/dev/null' '${IMAGE_ROOTFS}/etc/machine-id'
 }
-- 
2.17.1

Re: [PATCH] image-postproc-extension: empty mechine-id

[Baurzhan Ismagulov]

Hello Bao Cheng,

On Mon, Jul 08, 2019 at 10:57:36AM +0000, Su, Bao Cheng wrote:
> According to manpage of debian machine-id @
> https://manpages.debian.org/buster/systemd/machine-id.5.en.html,
> /etc/machine-id should be empty instead of removing.
> 
> Also according to above manpage, the dbus machine-id is copied to
> /etc/machine-id if systemd machine-id is empty. However, the dbus
> machine-id is also created during isar building, which stays the same
> for every machine using the same image.
> 
> So here instead of removing, empty this file, and the mechine id will
> be regenerated at the first boot. Also remove the dbus machine-id to
> prevent copying.

Thanks, applied to next.

I couldn't observe your original "sys-subsystem-net-devices-multi-user.device
timeouts" problem. Is it reproducible with stock Isar? Which architecture?

Also, at least for amd64, the machine id is only generated temporarily. The
file is not replaced since /etc is read-only at that moment. So we have to
revisit Claudius's rw patch. This works for arm since it is already rw.

With kind regards,
Baurzhan.

Re: [PATCH] image-postproc-extension: empty mechine-id

[Su, Bao Cheng]

Hello Baurzhan,

On 7/10/2019 4:48 PM, Baurzhan Ismagulov wrote:
> Hello Bao Cheng,
> 
> On Mon, Jul 08, 2019 at 10:57:36AM +0000, Su, Bao Cheng wrote:
>> According to manpage of debian machine-id @
>> https://manpages.debian.org/buster/systemd/machine-id.5.en.html,
>> /etc/machine-id should be empty instead of removing.
>>
>> Also according to above manpage, the dbus machine-id is copied to
>> /etc/machine-id if systemd machine-id is empty. However, the dbus
>> machine-id is also created during isar building, which stays the same
>> for every machine using the same image.
>>
>> So here instead of removing, empty this file, and the mechine id will
>> be regenerated at the first boot. Also remove the dbus machine-id to
>> prevent copying.
> 
> Thanks, applied to next.
> 
> I couldn't observe your original "sys-subsystem-net-devices-multi-user.device
> timeouts" problem. Is it reproducible with stock Isar? Which architecture?
> 

It is reproducible on the commit 
6f4314237c228c303d8e85459974008b18996e0d, with an arm64 board.

> Also, at least for amd64, the machine id is only generated temporarily. The
> file is not replaced since /etc is read-only at that moment. So we have to
> revisit Claudius's rw patch. This works for arm since it is already rw.
> 
> With kind regards,
> Baurzhan.
> 

BRs,
SBC

Re: [PATCH] image-postproc-extension: empty mechine-id

[Henning Schild]

Am Wed, 10 Jul 2019 10:48:31 +0200
schrieb Baurzhan Ismagulov <ibr@radix50.net>:

> Hello Bao Cheng,
> 
> On Mon, Jul 08, 2019 at 10:57:36AM +0000, Su, Bao Cheng wrote:
> > According to manpage of debian machine-id @
> > https://manpages.debian.org/buster/systemd/machine-id.5.en.html,
> > /etc/machine-id should be empty instead of removing.
> > 
> > Also according to above manpage, the dbus machine-id is copied to
> > /etc/machine-id if systemd machine-id is empty. However, the dbus
> > machine-id is also created during isar building, which stays the
> > same for every machine using the same image.
> > 
> > So here instead of removing, empty this file, and the mechine id
> > will be regenerated at the first boot. Also remove the dbus
> > machine-id to prevent copying.  
> 
> Thanks, applied to next.

Mhh the commit message looks pretty ugly. Probably because v2 was not
actually done with git format-patch.

I would suggest to clean that up and force-push next.

Henning

> I couldn't observe your original
> "sys-subsystem-net-devices-multi-user.device timeouts" problem. Is it
> reproducible with stock Isar? Which architecture?
> 
> Also, at least for amd64, the machine id is only generated
> temporarily. The file is not replaced since /etc is read-only at that
> moment. So we have to revisit Claudius's rw patch. This works for arm
> since it is already rw.
> 
> With kind regards,
> Baurzhan.
> 

Re: [PATCH] image-postproc-extension: empty mechine-id

[Su, Bao Cheng]

On 7/10/2019 7:44 PM, Schild, Henning (CT RDA IOT SES-DE) wrote:
> Am Wed, 10 Jul 2019 10:48:31 +0200
> schrieb Baurzhan Ismagulov <ibr@radix50.net>:
> 
>> Hello Bao Cheng,
>>
>> On Mon, Jul 08, 2019 at 10:57:36AM +0000, Su, Bao Cheng wrote:
>>> According to manpage of debian machine-id @
>>> https://manpages.debian.org/buster/systemd/machine-id.5.en.html,
>>> /etc/machine-id should be empty instead of removing.
>>>
>>> Also according to above manpage, the dbus machine-id is copied to
>>> /etc/machine-id if systemd machine-id is empty. However, the dbus
>>> machine-id is also created during isar building, which stays the
>>> same for every machine using the same image.
>>>
>>> So here instead of removing, empty this file, and the mechine id
>>> will be regenerated at the first boot. Also remove the dbus
>>> machine-id to prevent copying.
>>
>> Thanks, applied to next.
> 
> Mhh the commit message looks pretty ugly. Probably because v2 was not
> actually done with git format-patch.
> 
> I would suggest to clean that up and force-push next.
> 
yeah I saw the ugly message from the github.com. Do I have the 
permissions to force-push the next branch? or do I need re-send the
patch to mailing list?

> Henning
> 
>> I couldn't observe your original
>> "sys-subsystem-net-devices-multi-user.device timeouts" problem. Is it
>> reproducible with stock Isar? Which architecture?
>>
>> Also, at least for amd64, the machine id is only generated
>> temporarily. The file is not replaced since /etc is read-only at that
>> moment. So we have to revisit Claudius's rw patch. This works for arm
>> since it is already rw.
>>
>> With kind regards,
>> Baurzhan.
>>
> 

Re: [PATCH] image-postproc-extension: empty mechine-id

[Jan Kiszka]

On 11.07.19 06:06, [ext] Su, Bao Cheng wrote:
> On 7/10/2019 7:44 PM, Schild, Henning (CT RDA IOT SES-DE) wrote:
>> Am Wed, 10 Jul 2019 10:48:31 +0200
>> schrieb Baurzhan Ismagulov <ibr@radix50.net>:
>>
>>> Hello Bao Cheng,
>>>
>>> On Mon, Jul 08, 2019 at 10:57:36AM +0000, Su, Bao Cheng wrote:
>>>> According to manpage of debian machine-id @
>>>> https://manpages.debian.org/buster/systemd/machine-id.5.en.html,
>>>> /etc/machine-id should be empty instead of removing.
>>>>
>>>> Also according to above manpage, the dbus machine-id is copied to
>>>> /etc/machine-id if systemd machine-id is empty. However, the dbus
>>>> machine-id is also created during isar building, which stays the
>>>> same for every machine using the same image.
>>>>
>>>> So here instead of removing, empty this file, and the mechine id
>>>> will be regenerated at the first boot. Also remove the dbus
>>>> machine-id to prevent copying.
>>>
>>> Thanks, applied to next.
>>
>> Mhh the commit message looks pretty ugly. Probably because v2 was not
>> actually done with git format-patch.
>>
>> I would suggest to clean that up and force-push next.
>>
> yeah I saw the ugly message from the github.com. Do I have the 
> permissions to force-push the next branch? or do I need re-send the
> patch to mailing list?
> 

Baurzhan, please re-commit this one. Rewriting next is now less critical as it
used to be.

Jan

-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux

Re: [PATCH] image-postproc-extension: empty mechine-id

[Baurzhan Ismagulov]

On Thu, Jul 11, 2019 at 07:34:22AM +0200, Jan Kiszka wrote:
> Baurzhan, please re-commit this one. Rewriting next is now less critical as it
> used to be.

Done.

With kind regards,
Baurzhan.

Re: [PATCH] image-postproc-extension: empty mechine-id

[Henning Schild]

Am Thu, 11 Jul 2019 07:34:22 +0200
schrieb Jan Kiszka <jan.kiszka@siemens.com>:

> On 11.07.19 06:06, [ext] Su, Bao Cheng wrote:
> > On 7/10/2019 7:44 PM, Schild, Henning (CT RDA IOT SES-DE) wrote:  
> >> Am Wed, 10 Jul 2019 10:48:31 +0200
> >> schrieb Baurzhan Ismagulov <ibr@radix50.net>:
> >>  
> >>> Hello Bao Cheng,
> >>>
> >>> On Mon, Jul 08, 2019 at 10:57:36AM +0000, Su, Bao Cheng wrote:  
> >>>> According to manpage of debian machine-id @
> >>>> https://manpages.debian.org/buster/systemd/machine-id.5.en.html,
> >>>> /etc/machine-id should be empty instead of removing.
> >>>>
> >>>> Also according to above manpage, the dbus machine-id is copied to
> >>>> /etc/machine-id if systemd machine-id is empty. However, the dbus
> >>>> machine-id is also created during isar building, which stays the
> >>>> same for every machine using the same image.
> >>>>
> >>>> So here instead of removing, empty this file, and the mechine id
> >>>> will be regenerated at the first boot. Also remove the dbus
> >>>> machine-id to prevent copying.  
> >>>
> >>> Thanks, applied to next.  
> >>
> >> Mhh the commit message looks pretty ugly. Probably because v2 was
> >> not actually done with git format-patch.
> >>
> >> I would suggest to clean that up and force-push next.
> >>  
> > yeah I saw the ugly message from the github.com. Do I have the 
> > permissions to force-push the next branch? or do I need re-send the
> > patch to mailing list?
> >   
> 
> Baurzhan, please re-commit this one. Rewriting next is now less
> critical as it used to be.

Just re-read CONTRIBUTING.md and indeed there is no work about "next"
being rebasing ... There even is "please base your patches on next".

In this case rebasing (force-pushing) in indeed a no-go. Is that a bug
in the description or does Isar not have a rebasing staging branch?

I still remember the days when master was months behind next, forcing
everyone on next. In these days it was a no-go because master was too
slow, but i always assumed it would be possible.

Henning

> Jan
>