archiso 52-1
This commit is contained in:
parent
6e8bcea57a
commit
658fa0f42f
14 changed files with 81 additions and 16 deletions
13
archiso/airootfs/etc/pacman.d/hooks/40-locale-gen.hook
Normal file
13
archiso/airootfs/etc/pacman.d/hooks/40-locale-gen.hook
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
# remove from airootfs!
|
||||||
|
[Trigger]
|
||||||
|
Operation = Install
|
||||||
|
Type = Package
|
||||||
|
Target = glibc
|
||||||
|
|
||||||
|
[Action]
|
||||||
|
Description = Uncommenting en_US.UTF-8 locale and running locale-gen...
|
||||||
|
When = PostTransaction
|
||||||
|
Depends = glibc
|
||||||
|
Depends = sed
|
||||||
|
Depends = sh
|
||||||
|
Exec = /bin/sh -c "sed -i 's/#\(en_US\.UTF-8\)/\1/' /etc/locale.gen && locale-gen"
|
13
archiso/airootfs/etc/pacman.d/hooks/uncomment-mirrors.hook
Normal file
13
archiso/airootfs/etc/pacman.d/hooks/uncomment-mirrors.hook
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
# remove from airootfs!
|
||||||
|
[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
|
|
@ -0,0 +1,18 @@
|
||||||
|
# remove from airootfs!
|
||||||
|
# As a workaround for https://bugs.archlinux.org/task/49347 , remove pacman hooks specific to the ISO build process.
|
||||||
|
# If not, they would be used when pacstrap is run in the live environment.
|
||||||
|
|
||||||
|
[Trigger]
|
||||||
|
Operation = Install
|
||||||
|
Operation = Upgrade
|
||||||
|
Operation = Remove
|
||||||
|
Type = Package
|
||||||
|
Target = *
|
||||||
|
|
||||||
|
[Action]
|
||||||
|
Description = Work around FS#49347 by removing custom pacman hooks that are only required during ISO build...
|
||||||
|
When = PostTransaction
|
||||||
|
Depends = sh
|
||||||
|
Depends = coreutils
|
||||||
|
Depends = grep
|
||||||
|
Exec = /bin/sh -c "rm -- $(grep -Frl 'remove from airootfs' /etc/pacman.d/hooks/)"
|
|
@ -2,12 +2,14 @@
|
||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
[Match]
|
[Match]
|
||||||
Name=en*
|
Type=ether
|
||||||
Name=eth*
|
|
||||||
|
|
||||||
[Network]
|
[Network]
|
||||||
DHCP=yes
|
DHCP=yes
|
||||||
IPv6PrivacyExtensions=yes
|
IPv6PrivacyExtensions=yes
|
||||||
|
|
||||||
[DHCP]
|
[DHCPv4]
|
||||||
|
RouteMetric=512
|
||||||
|
|
||||||
|
[DHCPv6]
|
||||||
RouteMetric=512
|
RouteMetric=512
|
||||||
|
|
|
@ -2,12 +2,14 @@
|
||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
[Match]
|
[Match]
|
||||||
Name=wlp*
|
Type=wlan
|
||||||
Name=wlan*
|
|
||||||
|
|
||||||
[Network]
|
[Network]
|
||||||
DHCP=yes
|
DHCP=yes
|
||||||
IPv6PrivacyExtensions=yes
|
IPv6PrivacyExtensions=yes
|
||||||
|
|
||||||
[DHCP]
|
[DHCPv4]
|
||||||
|
RouteMetric=1024
|
||||||
|
|
||||||
|
[DHCPv6]
|
||||||
RouteMetric=1024
|
RouteMetric=1024
|
15
archiso/airootfs/etc/systemd/network/20-wwan.network
Normal file
15
archiso/airootfs/etc/systemd/network/20-wwan.network
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
#
|
||||||
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
|
[Match]
|
||||||
|
Type=wwan
|
||||||
|
|
||||||
|
[Network]
|
||||||
|
DHCP=yes
|
||||||
|
IPv6PrivacyExtensions=yes
|
||||||
|
|
||||||
|
[DHCPv4]
|
||||||
|
RouteMetric=2048
|
||||||
|
|
||||||
|
[DHCPv6]
|
||||||
|
RouteMetric=2048
|
|
@ -0,0 +1 @@
|
||||||
|
/usr/lib/systemd/system/ModemManager.service
|
|
@ -0,0 +1 @@
|
||||||
|
/usr/lib/systemd/system/ModemManager.service
|
|
@ -3,8 +3,6 @@
|
||||||
|
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Initializes Pacman keyring
|
Description=Initializes Pacman keyring
|
||||||
Wants=haveged.service
|
|
||||||
After=haveged.service
|
|
||||||
Requires=etc-pacman.d-gnupg.mount
|
Requires=etc-pacman.d-gnupg.mount
|
||||||
After=etc-pacman.d-gnupg.mount
|
After=etc-pacman.d-gnupg.mount
|
||||||
|
|
||||||
|
|
|
@ -2,5 +2,5 @@
|
||||||
|
|
||||||
--save /etc/pacman.d/mirrorlist
|
--save /etc/pacman.d/mirrorlist
|
||||||
--protocol https
|
--protocol https
|
||||||
--latest 70
|
--latest 20
|
||||||
--sort rate
|
--sort rate
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
alsa-utils
|
alsa-utils
|
||||||
amd-ucode
|
amd-ucode
|
||||||
|
archinstall
|
||||||
arch-install-scripts
|
arch-install-scripts
|
||||||
b43-fwcutter
|
b43-fwcutter
|
||||||
base
|
base
|
||||||
|
@ -33,7 +34,6 @@ gpart
|
||||||
gpm
|
gpm
|
||||||
gptfdisk
|
gptfdisk
|
||||||
grml-zsh-config
|
grml-zsh-config
|
||||||
haveged
|
|
||||||
hdparm
|
hdparm
|
||||||
intel-ucode
|
intel-ucode
|
||||||
ipw2100-fw
|
ipw2100-fw
|
||||||
|
@ -58,6 +58,7 @@ memtest86+
|
||||||
mkinitcpio
|
mkinitcpio
|
||||||
mkinitcpio-archiso
|
mkinitcpio-archiso
|
||||||
mkinitcpio-nfs-utils
|
mkinitcpio-nfs-utils
|
||||||
|
modemmanager
|
||||||
mtools
|
mtools
|
||||||
nano
|
nano
|
||||||
nbd
|
nbd
|
||||||
|
@ -83,6 +84,7 @@ rxvt-unicode-terminfo
|
||||||
sdparm
|
sdparm
|
||||||
sg3_utils
|
sg3_utils
|
||||||
smartmontools
|
smartmontools
|
||||||
|
sof-firmware
|
||||||
squashfs-tools
|
squashfs-tools
|
||||||
sudo
|
sudo
|
||||||
syslinux
|
syslinux
|
||||||
|
@ -94,6 +96,7 @@ testdisk
|
||||||
tmux
|
tmux
|
||||||
udftools
|
udftools
|
||||||
usb_modeswitch
|
usb_modeswitch
|
||||||
|
usbmuxd
|
||||||
usbutils
|
usbutils
|
||||||
vim
|
vim
|
||||||
vpnc
|
vpnc
|
||||||
|
|
|
@ -3,16 +3,15 @@
|
||||||
|
|
||||||
iso_name="archlinux"
|
iso_name="archlinux"
|
||||||
iso_label="ARCH_$(date +%Y%m)"
|
iso_label="ARCH_$(date +%Y%m)"
|
||||||
iso_publisher="Arch Linux <https://www.archlinux.org>"
|
iso_publisher="Arch Linux <https://archlinux.org>"
|
||||||
iso_application="Arch Linux Live/Rescue CD"
|
iso_application="Arch Linux Live/Rescue CD"
|
||||||
iso_version="$(date +%Y.%m.%d)"
|
iso_version="$(date +%Y.%m.%d)"
|
||||||
install_dir="arch"
|
install_dir="arch"
|
||||||
bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' 'uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito')
|
bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' 'uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito')
|
||||||
arch="x86_64"
|
arch="x86_64"
|
||||||
pacman_conf="pacman.conf"
|
pacman_conf="pacman.conf"
|
||||||
#airootfs_image_tool_options=('-comp' 'xz' '-Xbcj' 'x86' '-b' '1M' '-Xdict-size' '1M')
|
airootfs_image_type="squashfs"
|
||||||
#airootfs_image_tool_options=('-comp' 'xz')
|
airootfs_image_tool_options=('-comp' 'xz' '-Xbcj' 'x86' '-b' '1M' '-Xdict-size' '1M')
|
||||||
airootfs_image_tool_options=('-comp' 'zstd')
|
|
||||||
file_permissions=(
|
file_permissions=(
|
||||||
["/etc/shadow"]="0:0:400"
|
["/etc/shadow"]="0:0:400"
|
||||||
["/root"]="0:0:750"
|
["/root"]="0:0:750"
|
||||||
|
|
|
@ -35,7 +35,7 @@ echo
|
||||||
#isoLabel='arcolinux-next-'$arcolinuxVersion'-x86_64.iso'
|
#isoLabel='arcolinux-next-'$arcolinuxVersion'-x86_64.iso'
|
||||||
|
|
||||||
# setting of the general parameters
|
# setting of the general parameters
|
||||||
archisoRequiredVersion="archiso 51-1"
|
archisoRequiredVersion="archiso 52-1"
|
||||||
buildFolder=$HOME"/alci-build"
|
buildFolder=$HOME"/alci-build"
|
||||||
outFolder=$HOME"/Alci-Iso-Out"
|
outFolder=$HOME"/Alci-Iso-Out"
|
||||||
archisoVersion=$(sudo pacman -Q archiso)
|
archisoVersion=$(sudo pacman -Q archiso)
|
||||||
|
|
|
@ -35,7 +35,7 @@ echo
|
||||||
#isoLabel='arcolinux-next-'$arcolinuxVersion'-x86_64.iso'
|
#isoLabel='arcolinux-next-'$arcolinuxVersion'-x86_64.iso'
|
||||||
|
|
||||||
# setting of the general parameters
|
# setting of the general parameters
|
||||||
archisoRequiredVersion="archiso 51-1"
|
archisoRequiredVersion="archiso 52-1"
|
||||||
buildFolder=$HOME"/alci-build"
|
buildFolder=$HOME"/alci-build"
|
||||||
outFolder=$HOME"/Alci-Iso-Out"
|
outFolder=$HOME"/Alci-Iso-Out"
|
||||||
archisoVersion=$(sudo pacman -Q archiso)
|
archisoVersion=$(sudo pacman -Q archiso)
|
||||||
|
|
Loading…
Reference in a new issue