From 2911866e64c97c824526bca6711e3905a92227b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Wed, 22 Aug 2018 03:20:38 +0200 Subject: [PATCH 01/16] [profile] add sys group by default --- data/profile.conf.example | 2 +- lib/util.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/profile.conf.example b/data/profile.conf.example index a9ecd17..b81422e 100644 --- a/data/profile.conf.example +++ b/data/profile.conf.example @@ -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" diff --git a/lib/util.sh b/lib/util.sh index b30a600..678eff3 100644 --- a/lib/util.sh +++ b/lib/util.sh @@ -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 From d055b5571c1639093303f6ca7af6059dd8916712 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Sun, 26 Aug 2018 16:21:28 +0200 Subject: [PATCH 02/16] [util-iso-boot] add amd-ucode --- lib/util-iso-boot.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/util-iso-boot.sh b/lib/util-iso-boot.sh index be36f95..0ba5bdf 100644 --- a/lib/util-iso-boot.sh +++ b/lib/util-iso-boot.sh @@ -37,6 +37,7 @@ 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/intel-ucode/LICENSE $2/intel_ucode.LICENSE cp $1/boot/memtest86+/memtest.bin $2/memtest From 2106c3f7a15440a31952b309b32c15d475eb830c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Sun, 26 Aug 2018 16:43:54 +0200 Subject: [PATCH 03/16] [util-iso-boot] add license for amd-ucode --- lib/util-iso-boot.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/util-iso-boot.sh b/lib/util-iso-boot.sh index 0ba5bdf..18e3e33 100644 --- a/lib/util-iso-boot.sh +++ b/lib/util-iso-boot.sh @@ -39,6 +39,7 @@ 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 From 83f8b3e23dd7dea617e1c73a01dc7b37937cb560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Thu, 6 Sep 2018 01:16:06 +0200 Subject: [PATCH 04/16] [buildpkg] mkchrootpkg only supports one pkg per -I switch --- bin/buildpkg.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/buildpkg.in b/bin/buildpkg.in index bdae72b..9caa1f7 100644 --- a/bin/buildpkg.in +++ b/bin/buildpkg.in @@ -87,7 +87,7 @@ usage() { echo " -b Branch [default: ${target_branch}]" echo ' -c Recreate chroot' echo ' -h This help' - echo ' -i Install packages into the working copy of the chroot' + echo ' -i Install a package into the working copy of the chroot' echo ' -n Install and run namcap check' echo " -p Build list or pkg [default: ${build_list_pkg}]" echo ' -q Query settings and pretend build' @@ -109,7 +109,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) install_pkgs+=("$OPTARG"); mkchrootpkg_args+=(-I "$OPTARG") ;; n) namcap=true; mkchrootpkg_args+=(-n) ;; p) build_list_pkg="${OPTARG%/}" ;; q) pretend=true ;; From 86dae4f1e48a2d927024efd5d627c53663c5e5f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Thu, 6 Sep 2018 01:19:26 +0200 Subject: [PATCH 05/16] [buildpkg] simplify last commit --- bin/buildpkg.in | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/bin/buildpkg.in b/bin/buildpkg.in index 9caa1f7..95aa1c0 100644 --- a/bin/buildpkg.in +++ b/bin/buildpkg.in @@ -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 @@ -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 "$OPTARG") ;; + i) mkchrootpkg_args+=(-I "$OPTARG") ;; n) namcap=true; mkchrootpkg_args+=(-n) ;; p) build_list_pkg="${OPTARG%/}" ;; q) pretend=true ;; From 200abe383282f8ecd9c6bb6cd06d59d741a08cdf Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Thu, 6 Sep 2018 17:33:17 +0200 Subject: [PATCH 06/16] Add empty file /etc/mhwd-x86_64.conf File is required to avoid errors when multilib files is not present --- lib/util-iso.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/util-iso.sh b/lib/util-iso.sh index c3e7d2c..f3cbd65 100644 --- a/lib/util-iso.sh +++ b/lib/util-iso.sh @@ -249,6 +249,13 @@ make_image_root() { chroot_create "${path}" "${packages}" || die + # if profile has 'multilib="false"' + # work around mhwd install error when multilib files are not present + # create an empty file which presence is checked by mhwd + if [[ ${multilib} == "false" ]]; then + touch "${path}/etc/mhwd-x86_64.conf" + fi + pacman -Qr "${path}" > "${path}/rootfs-pkgs.txt" copy_overlay "${profile_dir}/root-overlay" "${path}" From 428d95ebf91356ed5c65483bdfb387a20a5e98a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Thu, 6 Sep 2018 19:32:21 +0200 Subject: [PATCH 07/16] [util-iso] honor multilib=false in profile.conf --- lib/util-iso.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/util-iso.sh b/lib/util-iso.sh index f3cbd65..3bb9e0a 100644 --- a/lib/util-iso.sh +++ b/lib/util-iso.sh @@ -249,11 +249,9 @@ make_image_root() { chroot_create "${path}" "${packages}" || die - # if profile has 'multilib="false"' - # work around mhwd install error when multilib files are not present - # create an empty file which presence is checked by mhwd - if [[ ${multilib} == "false" ]]; then - touch "${path}/etc/mhwd-x86_64.conf" + # 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" From a58e94e15ade56ad48c90f85e6e1f56078685aee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Sat, 8 Sep 2018 11:05:03 +0200 Subject: [PATCH 08/16] [util-iso-image] nvidia-304xx driver got removed --- lib/util-iso-image.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lib/util-iso-image.sh b/lib/util-iso-image.sh index 26fb935..f81f431 100644 --- a/lib/util-iso-image.sh +++ b/lib/util-iso-image.sh @@ -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/ From e99949a7001ec3c7639c28f3bd96aae1524fa1c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Tue, 2 Oct 2018 20:12:02 +0200 Subject: [PATCH 09/16] [util-iso-boot] set grubenv for grub-quiet --- lib/util-iso-boot.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/util-iso-boot.sh b/lib/util-iso-boot.sh index 18e3e33..2057eda 100644 --- a/lib/util-iso-boot.sh +++ b/lib/util-iso-boot.sh @@ -87,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}" From 0104b5c84d30ed6fc7dfe681e2f9b962db8e857c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Mon, 15 Oct 2018 21:24:04 +0200 Subject: [PATCH 10/16] [util-yaml] use different geoip service --- lib/util-yaml.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/util-yaml.sh b/lib/util-yaml.sh index a1a68e2..96399d7 100644 --- a/lib/util-yaml.sh +++ b/lib/util-yaml.sh @@ -257,7 +257,7 @@ write_locale_conf(){ echo "---" > "$conf" echo "localeGenPath: /etc/locale.gen" >> "$conf" if ${geoip}; then - echo "geoipUrl: https://geoip.tools/v1" >> "$conf" + echo "geoipUrl: http://ip-api.com/json" >> "$conf" echo "geoipStyle: legacy" >> "$conf" else echo "region: America" >> "$conf" From c6ec757f1769509c1be42143db7bf256d4e3339b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Sun, 21 Oct 2018 08:52:19 +0200 Subject: [PATCH 11/16] [util-yaml] update ip path --- lib/util-yaml.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/util-yaml.sh b/lib/util-yaml.sh index 96399d7..34b5819 100644 --- a/lib/util-yaml.sh +++ b/lib/util-yaml.sh @@ -257,7 +257,7 @@ write_locale_conf(){ echo "---" > "$conf" echo "localeGenPath: /etc/locale.gen" >> "$conf" if ${geoip}; then - echo "geoipUrl: http://ip-api.com/json" >> "$conf" + echo "geoipUrl: http://ip-api.com" >> "$conf" echo "geoipStyle: legacy" >> "$conf" else echo "region: America" >> "$conf" From 6c1636e9c21492e2bb75ac08963d1dd11a39517b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Sun, 21 Oct 2018 09:11:32 +0200 Subject: [PATCH 12/16] [util-yaml] use kde.org service --- lib/util-yaml.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/util-yaml.sh b/lib/util-yaml.sh index 34b5819..a4a280d 100644 --- a/lib/util-yaml.sh +++ b/lib/util-yaml.sh @@ -257,8 +257,8 @@ write_locale_conf(){ echo "---" > "$conf" echo "localeGenPath: /etc/locale.gen" >> "$conf" if ${geoip}; then - echo "geoipUrl: http://ip-api.com" >> "$conf" - echo "geoipStyle: legacy" >> "$conf" + echo "geoipUrl: https://geoip.kde.org/v1/calamares" >> "$conf" + echo "geoipStyle: json" >> "$conf" else echo "region: America" >> "$conf" echo "zone: New_York" >> "$conf" From a0ea27a56544135980c3f1def118bdd3ca7c49fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Sat, 3 Nov 2018 07:59:14 +0100 Subject: [PATCH 13/16] [util-iso] update xorriso cmds for v1.4.8 --- lib/util-iso.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/util-iso.sh b/lib/util-iso.sh index 3bb9e0a..f7696a3 100644 --- a/lib/util-iso.sh +++ b/lib/util-iso.sh @@ -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 \ @@ -189,9 +190,6 @@ assemble_iso(){ -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 From 97e0601cb48397df9c7a2b2ee239d456bedcb391 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Sat, 3 Nov 2018 08:48:20 +0100 Subject: [PATCH 14/16] [util-iso] use full-iso9660-filenames --- lib/util-iso.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/util-iso.sh b/lib/util-iso.sh index f7696a3..bcdd62c 100644 --- a/lib/util-iso.sh +++ b/lib/util-iso.sh @@ -187,6 +187,7 @@ 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}/ From 2559ff5bb2d07c28ef38c120f35fc928cc0d43c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Sat, 3 Nov 2018 08:56:03 +0100 Subject: [PATCH 15/16] [util.sh] use linux419 by default --- lib/util.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/util.sh b/lib/util.sh index 678eff3..ade9100 100644 --- a/lib/util.sh +++ b/lib/util.sh @@ -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='' From 0674438df134781b03e18ab04643201ed89b49da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Thu, 3 Jan 2019 19:18:23 +0100 Subject: [PATCH 16/16] [lib] update geoip service --- lib/util-yaml.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/util-yaml.sh b/lib/util-yaml.sh index a4a280d..e12a139 100644 --- a/lib/util-yaml.sh +++ b/lib/util-yaml.sh @@ -257,8 +257,9 @@ write_locale_conf(){ echo "---" > "$conf" echo "localeGenPath: /etc/locale.gen" >> "$conf" if ${geoip}; then - echo "geoipUrl: https://geoip.kde.org/v1/calamares" >> "$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"