diff options
| author | Erich Eckner <git@eckner.net> | 2018-06-25 08:59:18 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2018-06-25 08:59:18 +0200 |
| commit | 1beff0860b766219973d64d72f5f35cc95042820 (patch) | |
| tree | 1c99872c74dd66344a1b2bedbc530f7566017a30 | |
| parent | 51532d91c7e610b373afc34d43ceb5c5e3fcdd8c (diff) | |
| parent | b200ce82f7bf491611731b3b5fc1768613fe37e7 (diff) | |
| download | archiso32-1beff0860b766219973d64d72f5f35cc95042820.tar.xz | |
Merge remote-tracking branch 'upstream/master'
| -rwxr-xr-x | archiso/mkarchiso | 6 | ||||
| -rwxr-xr-x | configs/baseline/build.sh | 2 | ||||
| -rwxr-xr-x | configs/releng/build.sh | 2 | ||||
| -rw-r--r-- | configs/releng/packages.both | 1 |
4 files changed, 8 insertions, 3 deletions
diff --git a/archiso/mkarchiso b/archiso/mkarchiso index 9c3a835..5f9e887 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!" @@ -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 a559942..8c11e2d 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]" diff --git a/configs/releng/packages.both b/configs/releng/packages.both index a9fad8d..9417e57 100644 --- a/configs/releng/packages.both +++ b/configs/releng/packages.both @@ -51,7 +51,6 @@ rsync sdparm sg3_utils smartmontools -speedtouch sudo tcpdump testdisk |