Commit 15da548f authored by Frede Hundewadt's avatar Frede Hundewadt

Merge remote-tracking branch 'upstream/stable-0.15.x' into stable-0.15.x

parents f5e59807 0674438d
......@@ -71,8 +71,6 @@ load_user_info
load_config "${USERCONFDIR}/manjaro-tools.conf" || load_config "${SYSCONFDIR}/manjaro-tools.conf"
load_vars "$USER_HOME/.makepkg.conf" || load_vars /etc/makepkg.conf
install_pkgs=()
clean_first=false
wipe_clean=false
namcap=false
......@@ -87,7 +85,7 @@ usage() {
echo " -b <branch> Branch [default: ${target_branch}]"
echo ' -c Recreate chroot'
echo ' -h This help'
echo ' -i <pkgs> Install packages into the working copy of the chroot'
echo ' -i <pkg> Install a package into the working copy of the chroot'
echo ' -n Install and run namcap check'
echo " -p <pkg> Build list or pkg [default: ${build_list_pkg}]"
echo ' -q Query settings and pretend build'
......@@ -109,7 +107,7 @@ while getopts "${opts}" arg; do
a) target_arch="$OPTARG" ;;
b) target_branch="$OPTARG" ;;
c) clean_first=true ;;
i) install_pkgs+=("$OPTARG"); mkchrootpkg_args+=(-I ${install_pkgs[*]}) ;;
i) mkchrootpkg_args+=(-I "$OPTARG") ;;
n) namcap=true; mkchrootpkg_args+=(-n) ;;
p) build_list_pkg="${OPTARG%/}" ;;
q) pretend=true ;;
......
......@@ -38,7 +38,7 @@
# disable_systemd=('pacman-init')
# unset defaults to given values
# addgroups="lp,network,power,wheel"
# addgroups="lp,network,power,sys, wheel"
# the same workgroup name if samba is used
# smb_workgroup="Manjaro"
......
......@@ -37,7 +37,9 @@ prepare_initramfs(){
}
prepare_boot_extras(){
cp $1/boot/amd-ucode.img $2/amd_ucode.img
cp $1/boot/intel-ucode.img $2/intel_ucode.img
cp $1/usr/share/licenses/amd-ucode/LICENSE $2/amd_ucode.LICENSE
cp $1/usr/share/licenses/intel-ucode/LICENSE $2/intel_ucode.LICENSE
cp $1/boot/memtest86+/memtest.bin $2/memtest
cp $1/usr/share/licenses/common/GPL2/license.txt $2/memtest.COPYING
......@@ -85,6 +87,9 @@ prepare_grub(){
cp ${data}/unicode.pf2 ${grub}
cp -r ${data_live}/{locales,tz} ${grub}
msg2 "Set menu_show_once=1 in '${grub}/grubenv'"
grub-editenv ${grub}/grubenv set menu_show_once=1
local size=4M mnt="${mnt_dir}/efiboot" efi_img="$2/efi.img"
msg2 "Creating fat image of %s ..." "${size}"
truncate -s ${size} "${efi_img}"
......
......@@ -59,11 +59,6 @@ configure_mhwd_drivers(){
mkdir -p $drv_path/hybrid-intel-nvidia-bumblebee/
echo "" > $drv_path/hybrid-intel-nvidia-bumblebee/MHWDCONFIG
fi
if [ -z "$(ls $path | grep nvidia-304xx-utils 2> /dev/null)" ]; then
msg2 "Disabling Nvidia 304xx driver"
mkdir -p $drv_path/nvidia-304xx/
echo "" > $drv_path/nvidia-304xx/MHWDCONFIG
fi
if [ -z "$(ls $path | grep nvidia-340xx-utils 2> /dev/null)" ]; then
msg2 "Disabling Nvidia 340xx driver"
mkdir -p $drv_path/nvidia-340xx/
......
......@@ -178,6 +178,7 @@ assemble_iso(){
--sort-weight 0 / \
--sort-weight 1 /boot \
--grub2-mbr ${iso_root}/boot/grub/i386-pc/boot_hybrid.img \
-iso_mbr_part_type 0x00 \
-partition_offset 16 \
-b boot/grub/i386-pc/eltorito.img \
-c boot.catalog \
......@@ -186,12 +187,10 @@ assemble_iso(){
-append_partition 2 0xef ${iso_root}/efi.img \
-e --interval:appended_partition_2:all:: \
-no-emul-boot \
-full-iso9660-filenames \
-iso-level 3 \
-o ${iso_dir}/${iso_file} \
${iso_root}/
# arg to add with xorriso-1.4.7
# -iso_mbr_part_type 0x00
}
# Build ISO
......@@ -249,6 +248,11 @@ make_image_root() {
chroot_create "${path}" "${packages}" || die
# profide multilib usage to mhwd-script
if [[ ! -z ${multilib} ]]; then
echo 'MHWD64_IS_LIB32="'${multilib}'"' > "${path}/etc/mhwd-x86_64.conf"
fi
pacman -Qr "${path}" > "${path}/rootfs-pkgs.txt"
copy_overlay "${profile_dir}/root-overlay" "${path}"
......
......@@ -257,8 +257,9 @@ write_locale_conf(){
echo "---" > "$conf"
echo "localeGenPath: /etc/locale.gen" >> "$conf"
if ${geoip}; then
echo "geoipUrl: https://geoip.tools/v1" >> "$conf"
echo "geoipStyle: legacy" >> "$conf"
echo "geoipUrl: https://get.geojs.io/v1/ip/geo.json" >> "$conf"
echo "geoipStyle: json" >> "$conf"
echo "geoipSelector: timezone" >> "$conf"
else
echo "region: America" >> "$conf"
echo "zone: New_York" >> "$conf"
......
......@@ -315,7 +315,7 @@ init_buildiso(){
iso_label=$(get_iso_label "${dist_branding}${dist_release//.}")
[[ -z ${kernel} ]] && kernel="linux414"
[[ -z ${kernel} ]] && kernel="linux419"
[[ -z ${gpgkey} ]] && gpgkey=''
......@@ -386,7 +386,7 @@ load_profile_config(){
[[ -z ${login_shell} ]] && login_shell='/bin/bash'
if [[ -z ${addgroups} ]]; then
addgroups="lp,network,power,wheel"
addgroups="lp,network,power,sys,wheel"
fi
if [[ -z ${enable_systemd[@]} ]]; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment