OSDN Git Service

[disable] : download mirrorlist (archiso 45)
authorhayao <shun819.mail@gmail.com>
Wed, 29 Jul 2020 09:59:20 +0000 (18:59 +0900)
committerhayao <shun819.mail@gmail.com>
Wed, 29 Jul 2020 09:59:30 +0000 (18:59 +0900)
Do not download a mirrorlist durring build

Pacman's mirrolist will be updated by reflector.service in the live system.

build.sh

index 8f9b90e..002c466 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -802,34 +802,6 @@ make_customize_airootfs() {
         cp "${script_path}/mkinitcpio/mkinitcpio-plymouth.conf" "${work_dir}/${arch}/airootfs/etc/mkinitcpio.conf"
     fi
 
-    # Code to use common pacman.conf in archiso.
-    # cp "${script_path}/pacman.conf" "${work_dir}/${arch}/airootfs/etc"
-    # cp "${build_pacman_conf}" "${work_dir}/${arch}/airootfs/etc"
-
-    # Get the optimal mirror list.
-    local mirrorlisturl mirrorlisturl_all  mirrorlisturl_jp
-
-    case "${arch}" in
-        "x86_64")
-            mirrorlisturl_jp='https://www.archlinux.org/mirrorlist/?country=JP'
-            mirrorlisturl_all='https://www.archlinux.org/mirrorlist/?country=all'
-            ;;
-        "i686")
-            mirrorlisturl_jp='https://archlinux32.org/mirrorlist/?country=jp'
-            mirrorlisturl_all='https://archlinux32.org/mirrorlist/?country=all'
-            ;;
-    esac
-
-    if [[ "${japanese}" = true ]]; then
-        mirrorlisturl="${mirrorlisturl_jp}"
-    else
-        mirrorlisturl="${mirrorlisturl_all}"
-    fi
-    curl -o "${work_dir}/${arch}/airootfs/etc/pacman.d/mirrorlist" "${mirrorlisturl}"
-
-    # Add install guide to /root (disabled)
-    # lynx -dump -nolist 'https://wiki.archlinux.org/index.php/Installation_Guide?action=render' >> ${work_dir}/${arch}/airootfs/root/install.txt
-
 
     # customize_airootfs.sh options
     # -b            : Enable boot splash.