| Message ID | 20250411112618.3992560-1-felix.moessbauer@siemens.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2,1/1] fix: rebuild rootfs on change of USERS | expand |
On 11.04.25 13:26, Felix Moessbauer wrote: > In case a change to the Isar created users is done, this currently > only re-triggers the do_rootfs_postprocess task. This task changes the > rootfs (e.g. home dirs are moved) and by that needs to operate on a > clean one. Otherwise old homedirs might still remain in the final rootfs > or move operations are not possible. > > We fix this by ensuring that the do_rootfs_install task is executed > whenever a change to USERS is done. By that, we enter the > do_rootfs_postinstall with a clean rootfs. > > Reported-by: Clara Kowalsky <clara.kowalsky@siemens.com> > Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com> > --- > Changes since v1: > > - Also add dependency to USER_<x> for all x in USERS > > meta/classes/image-account-extension.bbclass | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/meta/classes/image-account-extension.bbclass b/meta/classes/image-account-extension.bbclass > index ea956cd5..3c461b1a 100644 > --- a/meta/classes/image-account-extension.bbclass > +++ b/meta/classes/image-account-extension.bbclass > @@ -8,6 +8,10 @@ > USERS ??= "" > GROUPS ??= "" > > +# rebuild rootfs on change of USERS as homes might be moved / created > +# no need to depend on GROUPS as they don't create directories > +# groups need to be created before users, hence do not move the user creation into > +# the do_rootfs_install task but only add a dependency > python() { > for entry in (d.getVar("GROUPS") or "").split(): > group_entry = "GROUP_{}".format(entry) > @@ -16,7 +20,9 @@ python() { > for entry in (d.getVar("USERS") or "").split(): > user_entry = "USER_{}".format(entry) > d.appendVarFlag("image_postprocess_accounts", "vardeps", " {}".format(user_entry)) > + d.appendVarFlag("do_rootfs_install", "vardeps", " {}".format(user_entry)) > } > +do_rootfs_install[vardeps] += "USERS" > > def image_create_groups(d: "DataSmart") -> None: > """Creates the groups defined in the ``GROUPS`` bitbake variable. This works, at least for the case of adding / moving the home directory of an existing user. Only removing an existing home dir when removing all home flags of a user is not covered, but we can ignore this for now. BR, Clara
diff --git a/meta/classes/image-account-extension.bbclass b/meta/classes/image-account-extension.bbclass index ea956cd5..3c461b1a 100644 --- a/meta/classes/image-account-extension.bbclass +++ b/meta/classes/image-account-extension.bbclass @@ -8,6 +8,10 @@ USERS ??= "" GROUPS ??= "" +# rebuild rootfs on change of USERS as homes might be moved / created +# no need to depend on GROUPS as they don't create directories +# groups need to be created before users, hence do not move the user creation into +# the do_rootfs_install task but only add a dependency python() { for entry in (d.getVar("GROUPS") or "").split(): group_entry = "GROUP_{}".format(entry) @@ -16,7 +20,9 @@ python() { for entry in (d.getVar("USERS") or "").split(): user_entry = "USER_{}".format(entry) d.appendVarFlag("image_postprocess_accounts", "vardeps", " {}".format(user_entry)) + d.appendVarFlag("do_rootfs_install", "vardeps", " {}".format(user_entry)) } +do_rootfs_install[vardeps] += "USERS" def image_create_groups(d: "DataSmart") -> None: """Creates the groups defined in the ``GROUPS`` bitbake variable.
In case a change to the Isar created users is done, this currently only re-triggers the do_rootfs_postprocess task. This task changes the rootfs (e.g. home dirs are moved) and by that needs to operate on a clean one. Otherwise old homedirs might still remain in the final rootfs or move operations are not possible. We fix this by ensuring that the do_rootfs_install task is executed whenever a change to USERS is done. By that, we enter the do_rootfs_postinstall with a clean rootfs. Reported-by: Clara Kowalsky <clara.kowalsky@siemens.com> Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com> --- Changes since v1: - Also add dependency to USER_<x> for all x in USERS meta/classes/image-account-extension.bbclass | 6 ++++++ 1 file changed, 6 insertions(+)