Johannes/ISO
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configs/releng: move the mirror uncommenting sed command from customize_airootfs.sh to a pacman hook

Browse Source 
After pacman-mirrorlist is installed, /etc/pacman.d/hooks/uncomment-mirrors.hook will run a sed command which uncomments all Server lines in /etc/pacman.d/mirrorlist.
This brings us another step closer to the complete removal of customize_airootfs.sh.

Related to https://gitlab.archlinux.org/archlinux/archiso/-/issues/21 .
This commit is contained in:
nl6720 2021-01-24 17:29:01 +02:00
parent a2c8dd3173
commit 4f4047a3f8
No known key found for this signature in database
GPG Key ID: 5CE88535E188D369
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configs/releng/airootfs/etc/pacman.d/hooks/uncomment-mirrors.hook Normal file
View File

@ -0,0 +1,12 @@
[Trigger]
Operation = Install
Operation = Upgrade
Type = Package
Target = pacman-mirrorlist
[Action]
Description = Uncommenting all mirrors in /etc/pacman.d/mirrorlist...
When = PostTransaction
Depends = pacman-mirrorlist
Depends = sed
Exec = /usr/bin/sed -i "s/#Server/Server/g" /etc/pacman.d/mirrorlist

2
configs/releng/airootfs/root/customize_airootfs.sh
View File

@ -8,5 +8,3 @@ set -e -u
sed -i 's/#\(en_US\.UTF-8\)/\1/' /etc/locale.gen sed -i 's/#\(en_US\.UTF-8\)/\1/' /etc/locale.gen
locale-gen locale-gen
sed -i "s/#Server/Server/g" /etc/pacman.d/mirrorlist