diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2017-03-08 12:23:05 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-03-09 16:21:27 +0100 |
| commit | 9d81b70297231ad60e4fab83a75ee9ca93444ede (patch) | |
| tree | 15df93a2971cca023548b6c4cb803ff847246093 /scripts | |
| parent | 2789bf3517e04da4fbc4d4f0822db55663bbc87d (diff) | |
| download | ptxdist-9d81b70297231ad60e4fab83a75ee9ca93444ede.tar.gz ptxdist-9d81b70297231ad60e4fab83a75ee9ca93444ede.tar.xz | |
scripts/lib/ptxd_make: fix image root permission, don't leak user's umask
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/ptxd_make_image_genimage.sh | 2 | ||||
| -rw-r--r-- | scripts/lib/ptxd_make_image_prepare_work_dir.sh | 2 | ||||
| -rw-r--r-- | scripts/lib/ptxd_make_xpkg_prepare.sh | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/scripts/lib/ptxd_make_image_genimage.sh b/scripts/lib/ptxd_make_image_genimage.sh index 2112875e4..b4a8e9de2 100644 --- a/scripts/lib/ptxd_make_image_genimage.sh +++ b/scripts/lib/ptxd_make_image_genimage.sh @@ -56,7 +56,7 @@ ptxd_make_image_genimage_impl() { ptxd_make_image_genimage_config "${1}" && rm -rf "${pkg_dir}" && - mkdir -p "${pkg_dir}" && + install -m 755 -d "${pkg_dir}" && for file in ${image_files}; do ptxd_make_extract_archive "${file}" "${pkg_dir}" done && diff --git a/scripts/lib/ptxd_make_image_prepare_work_dir.sh b/scripts/lib/ptxd_make_image_prepare_work_dir.sh index 2b8f10a81..84a6ca8db 100644 --- a/scripts/lib/ptxd_make_image_prepare_work_dir.sh +++ b/scripts/lib/ptxd_make_image_prepare_work_dir.sh @@ -51,7 +51,7 @@ ${list[*]} fi rm -rf "${work_dir}" && - mkdir -p "${work_dir}" && + install -m 755 -d "${work_dir}" && ARCH="${PTXDIST_IPKG_ARCH_STRING}" \ SRC="" \ diff --git a/scripts/lib/ptxd_make_xpkg_prepare.sh b/scripts/lib/ptxd_make_xpkg_prepare.sh index 561937304..f473375e7 100644 --- a/scripts/lib/ptxd_make_xpkg_prepare.sh +++ b/scripts/lib/ptxd_make_xpkg_prepare.sh @@ -58,7 +58,7 @@ ptxd_make_xpkg_prepare() { "${pkg_xpkg_cmds}" \ "${pkg_xpkg_perms}" \ "${pkg_xpkg_install_deps}" && - mkdir -p -- "${pkg_xpkg_control_dir}" && + install -m 755 -d -- "${pkg_xpkg_control_dir}" && touch "${pkg_xpkg_perms}" && touch "${pkg_xpkg_cmds}" || return @@ -82,7 +82,8 @@ install_init: @DEPENDS@ -> ${dep}" VERSION="${pkg_xpkg_version}" \ DEPENDS="${dep}" \ ptxd_replace_magic "${PTXDIST_TOPDIR}/config/xpkg/ipkg.control" > \ - "${pkg_xpkg_control}" || return + "${pkg_xpkg_control}" && + chmod 644 "${pkg_xpkg_control}" || return local script for script in preinst postinst prerm postrm; do |