Skip to contentSkip to conversation

fs: use our own mkpasswd when creating users

PATCH New Yann E. MORIN 3 participants 3 messages May 10, 2014 – May 11, 2014 VFS

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fs: use our own mkpasswd when creating users

From: "Yann E. MORIN" <[email protected]>

Export PATH=$(BR_PATH) so that our own mkpasswd is found before any existing host-system one.

---
 fs/common.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/common.mk +1 -1
index 831365e..47199c7 100644
@@ -83,7 +83,7 @@ ifneq ($$(ROOTFS_USERS_TABLES),)
 	cat $$(ROOTFS_USERS_TABLES) >> $(USERS_TABLE)
 endif
 	printf '$(subst $(sep),\n,$(PACKAGES_USERS))' >> $(USERS_TABLE)
-	$(TOPDIR)/support/scripts/mkusers $(USERS_TABLE) $(TARGET_DIR) >> $(FAKEROOT_SCRIPT)
+	PATH=$(BR_PATH) $(TOPDIR)/support/scripts/mkusers $(USERS_TABLE) $(TARGET_DIR) >> $(FAKEROOT_SCRIPT)
 	echo "$$(ROOTFS_$(2)_CMD)" >> $$(FAKEROOT_SCRIPT)
 	chmod a+x $$(FAKEROOT_SCRIPT)
 	$$(HOST_DIR)/usr/bin/fakeroot -- $$(FAKEROOT_SCRIPT)
Signature · 1 line
1.8.3.2
#1 lore raw

PATCH 1/1 fs: use our own mkpasswd when creating users

Hi Yann,

Le 10/05/2014 15:39, Yann E. MORIN a ?crit :

Quoted 18 lines

From: "Yann E. MORIN" <[email protected]>

Export PATH=$(BR_PATH) so that our own mkpasswd is found before any existing host-system one.

---
 fs/common.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/common.mk +0 -0
index 831365e..47199c7 100644

fs/common.mk ifneq ($$(ROOTFS_USERS_TABLES),) · line 89

Quoted 8 lines
fs/common.mk +1 -1
@@ -83,7 +83,7 @@ ifneq ($$(ROOTFS_USERS_TABLES),)
 	cat $$(ROOTFS_USERS_TABLES) >> $(USERS_TABLE)
 endif
 	printf '$(subst $(sep),\n,$(PACKAGES_USERS))' >> $(USERS_TABLE)
-	$(TOPDIR)/support/scripts/mkusers $(USERS_TABLE) $(TARGET_DIR) >> $(FAKEROOT_SCRIPT)
+	PATH=$(BR_PATH) $(TOPDIR)/support/scripts/mkusers $(USERS_TABLE) $(TARGET_DIR) >> $(FAKEROOT_SCRIPT)
 	echo "$$(ROOTFS_$(2)_CMD)" >> $$(FAKEROOT_SCRIPT)
 	chmod a+x $$(FAKEROOT_SCRIPT)
 	$$(HOST_DIR)/usr/bin/fakeroot -- $$(FAKEROOT_SCRIPT)

Tested on Fedora host which has an incompatible version of mkpasswd.

Best regards,
Romain Naour

#2 lore raw

PATCH 1/1 fs: use our own mkpasswd when creating users

In reply to Yann E. MORIN
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

From: "Yann E. MORIN" <[email protected]> Export PATH=$(BR_PATH) so that our own mkpasswd is found before any existing host-system one.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard