asgardius/kimberly-build
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

archiso 52-1

Browse source
This commit is contained in:
Erik Dubois 2021-04-02 15:38:05 +02:00
parent 6e8bcea57a
commit 658fa0f42f
14 changed files with 81 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
archiso/airootfs/etc/pacman.d/hooks/40-locale-gen.hook Normal file
View 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
View 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

18
archiso/airootfs/etc/pacman.d/hooks/zzzz99-remove-custom-hooks-from-airootfs.hook Normal file
View file

@ -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/)"

8
archiso/airootfs/etc/systemd/network/20-ethernet.network
View file

@ -2,12 +2,14 @@
# SPDX-License-Identifier: GPL-3.0-or-later
[Match]
Name=en*
Name=eth*
Type=ether
[Network]
DHCP=yes
IPv6PrivacyExtensions=yes
[DHCP]
[DHCPv4]
RouteMetric=512
[DHCPv6]
RouteMetric=512

8
archiso/airootfs/etc/systemd/network/20-wireless.network → archiso/airootfs/etc/systemd/network/20-wlan.network
View file

@ -2,12 +2,14 @@
# SPDX-License-Identifier: GPL-3.0-or-later
[Match]
Name=wlp*
Name=wlan*
Type=wlan
[Network]
DHCP=yes
IPv6PrivacyExtensions=yes
[DHCP]
[DHCPv4]
RouteMetric=1024
[DHCPv6]
RouteMetric=1024

15
archiso/airootfs/etc/systemd/network/20-wwan.network Normal file
View 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

1
archiso/airootfs/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service Symbolic link
View file

@ -0,0 +1 @@
/usr/lib/systemd/system/ModemManager.service

1
archiso/airootfs/etc/systemd/system/multi-user.target.wants/ModemManager.service Symbolic link
View file

@ -0,0 +1 @@
/usr/lib/systemd/system/ModemManager.service

2
archiso/airootfs/etc/systemd/system/pacman-init.service
View file

@ -3,8 +3,6 @@
[Unit]
Description=Initializes Pacman keyring
Wants=haveged.service
After=haveged.service
Requires=etc-pacman.d-gnupg.mount
After=etc-pacman.d-gnupg.mount

2
archiso/airootfs/etc/xdg/reflector/reflector.conf
View file

@ -2,5 +2,5 @@
--save /etc/pacman.d/mirrorlist
--protocol https
--latest 70
--latest 20
--sort rate

5
archiso/packages.x86_64
View file

@ -2,6 +2,7 @@
# SPDX-License-Identifier: GPL-3.0-or-later
alsa-utils
amd-ucode
archinstall
arch-install-scripts
b43-fwcutter
base
@ -33,7 +34,6 @@ gpart
gpm
gptfdisk
grml-zsh-config
haveged
hdparm
intel-ucode
ipw2100-fw
@ -58,6 +58,7 @@ memtest86+
mkinitcpio
mkinitcpio-archiso
mkinitcpio-nfs-utils
modemmanager
mtools
nano
nbd
@ -83,6 +84,7 @@ rxvt-unicode-terminfo
sdparm
sg3_utils
smartmontools
sof-firmware
squashfs-tools
sudo
syslinux
@ -94,6 +96,7 @@ testdisk
tmux
udftools
usb_modeswitch
usbmuxd
usbutils
vim
vpnc

7
archiso/profiledef.sh
View file

@ -3,16 +3,15 @@
iso_name="archlinux"
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_version="$(date +%Y.%m.%d)"
install_dir="arch"
bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' 'uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito')
arch="x86_64"
pacman_conf="pacman.conf"
#airootfs_image_tool_options=('-comp' 'xz' '-Xbcj' 'x86' '-b' '1M' '-Xdict-size' '1M')
#airootfs_image_tool_options=('-comp' 'xz')
airootfs_image_tool_options=('-comp' 'zstd')
airootfs_image_type="squashfs"
airootfs_image_tool_options=('-comp' 'xz' '-Xbcj' 'x86' '-b' '1M' '-Xdict-size' '1M')
file_permissions=(
["/etc/shadow"]="0:0:400"
["/root"]="0:0:750"

2
installation-scripts/30-build-the-iso-the-first-time.sh
View file

@ -35,7 +35,7 @@ echo
#isoLabel='arcolinux-next-'$arcolinuxVersion'-x86_64.iso'
# setting of the general parameters
archisoRequiredVersion="archiso 51-1"
archisoRequiredVersion="archiso 52-1"
buildFolder=$HOME"/alci-build"
outFolder=$HOME"/Alci-Iso-Out"
archisoVersion=$(sudo pacman -Q archiso)

2
installation-scripts/40-build-the-iso-local-again.sh
View file

@ -35,7 +35,7 @@ echo
#isoLabel='arcolinux-next-'$arcolinuxVersion'-x86_64.iso'
# setting of the general parameters
archisoRequiredVersion="archiso 51-1"
archisoRequiredVersion="archiso 52-1"
buildFolder=$HOME"/alci-build"
outFolder=$HOME"/Alci-Iso-Out"
archisoVersion=$(sudo pacman -Q archiso)