From 9e660ee86e185a42514f11d1f7bab80dc3c1c49c Mon Sep 17 00:00:00 2001 From: Armin Luntzer Date: Thu, 22 Nov 2007 19:50:16 +0100 Subject: mkarchroot: add -M switch for a custom makepkg.conf Signed-off-by: Jason Chu --- mkarchroot | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'mkarchroot') diff --git a/mkarchroot b/mkarchroot index 9fd2022..d181daf 100755 --- a/mkarchroot +++ b/mkarchroot @@ -24,16 +24,18 @@ usage () echo " -u Update the chroot via pacman" echo " -f Force overwrite of files in the working-dir" echo " -C location of a pacman config file" + echo " -M location of a makepkg config file" echo " -h This message" exit $1 } -while getopts 'r:ufhC:' arg; do +while getopts 'r:ufhC:M:' arg; do case "${arg}" in r) RUN="$OPTARG" ;; u) RUN="pacman -Syu" ;; f) FORCE="y" ;; C) pac_conf="$OPTARG" ;; + M) makepkg_conf="$OPTARG" ;; h|?) usage 0 ;; *) echo "invalid argument '${arg}'"; usage 1 ;; esac @@ -156,6 +158,12 @@ else cp ${pac_conf} ${working_dir}/etc/pacman.conf fi + if [ "$makepkg_conf" != "" ]; then + echo "installing custom makepkg.conf" + cp ${makepkg_conf} ${working_dir}/etc/makepkg.conf + fi + + echo "generating default locales" sed -i "s|^#\(.*$LANG\)|\1|g" "${working_dir}/etc/locale.gen" chroot "${working_dir}" locale-gen -- cgit v1.2.3-24-g4f1b