From 5f57352398e9ec7ab7bbe14fe24619987235060f Mon Sep 17 00:00:00 2001
From: Sean Enck via arch-releng <arch-releng@archlinux.org>
Date: Sun, 17 Jun 2018 10:22:09 -0400
Subject: Drop the '-d' from pacstrap calls

The '-d' in pacstrap is a noop nowadays, keeping it may cause confusion

Signed-off-by: Sean Enck <enckse@gmail.com>
---
 archiso/mkarchiso | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'archiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 9c3a835..87b9587 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -154,9 +154,9 @@ _pacman ()
     _msg_info "Installing packages to '${work_dir}/airootfs/'..."
 
     if [[ "${quiet}" = "y" ]]; then
-        pacstrap -C "${pacman_conf}" -c -d -G -M "${work_dir}/airootfs" $* &> /dev/null
+        pacstrap -C "${pacman_conf}" -c -G -M "${work_dir}/airootfs" $* &> /dev/null
     else
-        pacstrap -C "${pacman_conf}" -c -d -G -M "${work_dir}/airootfs" $*
+        pacstrap -C "${pacman_conf}" -c -G -M "${work_dir}/airootfs" $*
     fi
 
     _msg_info "Packages installed successfully!"
-- 
cgit v1.2.3-70-g09d2


From b200ce82f7bf491611731b3b5fc1768613fe37e7 Mon Sep 17 00:00:00 2001
From: Gerardo Exequiel Pozzi <vmlinuz386@gmail.com>
Date: Sat, 23 Jun 2018 16:09:33 -0300
Subject: Ensure correct umask for scripts

Fix for FS#58473

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@gmail.com>
---
 archiso/mkarchiso         | 2 ++
 configs/baseline/build.sh | 2 ++
 configs/releng/build.sh   | 2 ++
 3 files changed, 6 insertions(+)

(limited to 'archiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 87b9587..5f9e887 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -367,6 +367,8 @@ if [[ ${EUID} -ne 0 ]]; then
     _msg_error "This script must be run as root." 1
 fi
 
+umask 0022
+
 while getopts 'p:r:C:L:P:A:D:w:o:s:c:g:vh' arg; do
     case "${arg}" in
         p) pkg_list="${pkg_list} ${OPTARG}" ;;
diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh
index b6f7b4c..7c61d03 100755
--- a/configs/baseline/build.sh
+++ b/configs/baseline/build.sh
@@ -12,6 +12,8 @@ out_dir=out
 
 script_path=$(readlink -f ${0%/*})
 
+umask 0022
+
 # Helper function to run make_*() only one time per architecture.
 run_once() {
     if [[ ! -e ${work_dir}/build.${1}_${arch} ]]; then
diff --git a/configs/releng/build.sh b/configs/releng/build.sh
index 72b1e3f..3cb0675 100755
--- a/configs/releng/build.sh
+++ b/configs/releng/build.sh
@@ -14,6 +14,8 @@ arch=$(uname -m)
 verbose=""
 script_path=$(readlink -f ${0%/*})
 
+umask 0022
+
 _usage ()
 {
     echo "usage ${0} [options]"
-- 
cgit v1.2.3-70-g09d2