Commit 3fbd9887 authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Thomas Petazzoni
Browse files

filesystems: also chown symlinks 



Currently, the symlinks in the generated filesystems will have the
UID of the user running the build, because 'chown' does not change
the ownership of symlinks, by default.

Although the implications are limited, some may not want that UID
to leak in the generated filesystems.

So, use 'chown -h' so even symlinks get properly chowned.

Reported-by: default avatarAngelo Dureghello <angelo@barix.com>
Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 54ba2704

fs/common.mk

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ $$(BINARIES_DIR)/rootfs.$(1): target-finalize $$(ROOTFS_$(2)_DEPENDENCIES) 
	rm -f $$(FAKEROOT_SCRIPT)

	rm -f $$(TARGET_DIR_WARNING_FILE)

	rm -f $(USERS_TABLE)

	echo "chown -R 0:0 $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT)

	echo "chown -h -R 0:0 $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT)

ifneq ($$(ROOTFS_DEVICE_TABLES),)

	cat $$(ROOTFS_DEVICE_TABLES) > $$(FULL_DEVICE_TABLE)

ifeq ($$(BR2_ROOTFS_DEVICE_CREATION_STATIC),y)

fs/iso9660/iso9660.mk

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ else 
endif

	# Use fakeroot to pretend all target binaries are owned by root

	rm -f $(FAKEROOT_SCRIPT)

	echo "chown -R 0:0 $(ISO9660_TARGET_DIR)" >> $(FAKEROOT_SCRIPT)

	echo "chown -h -R 0:0 $(ISO9660_TARGET_DIR)" >> $(FAKEROOT_SCRIPT)

	# Use fakeroot so mkisofs believes the previous fakery

	echo "$(HOST_DIR)/usr/bin/genisoimage -R -b boot/grub/stage2_eltorito -no-emul-boot " \

		"-boot-load-size 4 -boot-info-table -o $@ $(ISO9660_TARGET_DIR)" \

support/scripts/mkusers

+1 −1
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ add_one_user() { 
    # (Note: stdout goes to the fakeroot-script)

    if [ "${home}" != "-" ]; then

        mkdir -p "${TARGET_DIR}/${home}"

        printf "chown -R %d:%d '%s'\n" "${uid}" "${_gid}" "${TARGET_DIR}/${home}"

        printf "chown -h -R %d:%d '%s'\n" "${uid}" "${_gid}" "${TARGET_DIR}/${home}"

    fi

}