Message ID | 1538521340-25386-1-git-send-email-matthew.weber@rockwellcollins.com |
---|---|
State | Accepted |
Headers | show |
Series | [v2] fs/common: allow custom user table to override package-defined users | expand |
On 03/10/2018 00:02, Matt Weber wrote: > Currently, when a custom user table and a package define the same user, > the settings from the package takes precedence over the ones from the > custom user table. > > However, it makes sense to allow the settings from the custom user table > take precedence. For example, it would allow redirecting the user's > home directory to an alternate location (e.g. away from tmp and into a > partition that is persistent). > > The support/scripts/mkusers script will only retain settings from the > latest definition it finds. > > Thus, by passing the custom user table after the package defined users, > it is possible to override the package provided user definitions. > > Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> > Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com> Applied to master, thanks. Regards, Arnout > --- > Change v1 -> v2 > [Yann > - Updated commit message > --- > fs/common.mk | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/fs/common.mk b/fs/common.mk > index abf3541..453da60 100644 > --- a/fs/common.mk > +++ b/fs/common.mk > @@ -75,10 +75,11 @@ $(ROOTFS_COMMON_TAR): $(ROOTFS_COMMON_DEPENDENCIES) target-finalize > echo '#!/bin/sh' > $(FAKEROOT_SCRIPT) > echo "set -e" >> $(FAKEROOT_SCRIPT) > echo "chown -h -R 0:0 $(TARGET_DIR)" >> $(FAKEROOT_SCRIPT) > + > + $(call PRINTF,$(PACKAGES_USERS)) >> $(USERS_TABLE) > ifneq ($(ROOTFS_USERS_TABLES),) > cat $(ROOTFS_USERS_TABLES) >> $(USERS_TABLE) > endif > - $(call PRINTF,$(PACKAGES_USERS)) >> $(USERS_TABLE) > PATH=$(BR_PATH) $(TOPDIR)/support/scripts/mkusers $(USERS_TABLE) $(TARGET_DIR) >> $(FAKEROOT_SCRIPT) > ifneq ($(ROOTFS_DEVICE_TABLES),) > cat $(ROOTFS_DEVICE_TABLES) > $(FULL_DEVICE_TABLE) >
>>>>> "Matt" == Matt Weber <matthew.weber@rockwellcollins.com> writes: > Currently, when a custom user table and a package define the same user, > the settings from the package takes precedence over the ones from the > custom user table. > However, it makes sense to allow the settings from the custom user table > take precedence. For example, it would allow redirecting the user's > home directory to an alternate location (e.g. away from tmp and into a > partition that is persistent). > The support/scripts/mkusers script will only retain settings from the > latest definition it finds. > Thus, by passing the custom user table after the package defined users, > it is possible to override the package provided user definitions. > Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> > Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com> > --- > Change v1 -> v2 > [Yann > - Updated commit message Committed to 2018.08.x, thanks.
diff --git a/fs/common.mk b/fs/common.mk index abf3541..453da60 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -75,10 +75,11 @@ $(ROOTFS_COMMON_TAR): $(ROOTFS_COMMON_DEPENDENCIES) target-finalize echo '#!/bin/sh' > $(FAKEROOT_SCRIPT) echo "set -e" >> $(FAKEROOT_SCRIPT) echo "chown -h -R 0:0 $(TARGET_DIR)" >> $(FAKEROOT_SCRIPT) + + $(call PRINTF,$(PACKAGES_USERS)) >> $(USERS_TABLE) ifneq ($(ROOTFS_USERS_TABLES),) cat $(ROOTFS_USERS_TABLES) >> $(USERS_TABLE) endif - $(call PRINTF,$(PACKAGES_USERS)) >> $(USERS_TABLE) PATH=$(BR_PATH) $(TOPDIR)/support/scripts/mkusers $(USERS_TABLE) $(TARGET_DIR) >> $(FAKEROOT_SCRIPT) ifneq ($(ROOTFS_DEVICE_TABLES),) cat $(ROOTFS_DEVICE_TABLES) > $(FULL_DEVICE_TABLE)