Update archiso profile to match upstream changes
This commit is contained in:
parent
3189fc464a
commit
c2353ad859
GPG key ID:
152FAC923B0E132C
18 changed files with 51 additions and 39 deletions
|
|
@ -172,6 +172,9 @@ function update_live_env() {
|
|||
# MOTD
|
||||
sed -i -r "s/_+/$KIT_NAME_FULL Linux Environment/" "$PROFILE_DIR/airootfs/etc/motd"
|
||||
|
||||
# Network
|
||||
ln -s "/run/systemd/resolve/stub-resolv.conf" "$PROFILE_DIR/airootfs/etc/resolv.conf"
|
||||
|
||||
# Oh My ZSH
|
||||
git clone --depth=1 https://github.com/robbyrussell/oh-my-zsh.git "$SKEL_DIR/.oh-my-zsh"
|
||||
rm -Rf "$SKEL_DIR/.oh-my-zsh/.git"
|
||||
|
|
@ -208,7 +211,7 @@ function update_live_env() {
|
|||
# Tech user
|
||||
echo "tech:$(echo "$TECH_PASSWORD" | openssl passwd -6 -stdin):14871::::::" >> "$PROFILE_DIR/airootfs/etc/shadow"
|
||||
|
||||
# Timezonew
|
||||
# Timezone
|
||||
ln -sf "/usr/share/zoneinfo/$LINUX_TIME_ZONE" "$PROFILE_DIR/airootfs/etc/localtime"
|
||||
|
||||
if [[ "${1:-}" != "--minimal" ]]; then
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@ mkinitcpio-archiso
|
|||
mprime
|
||||
nano
|
||||
ncdu
|
||||
openssh
|
||||
p7zip
|
||||
perl
|
||||
pipes.sh
|
||||
|
|
|
|||
|
|
@ -0,0 +1,7 @@
|
|||
# The broadcom-wl package requires some modules to be disabled in order to use
|
||||
# wl. Since the ISO image needs to cover many hardware cases, this file
|
||||
# overrides the default blacklist in /usr/lib/modprobe.d/
|
||||
#
|
||||
# If you need to use wl, you may need to delete this file, then `rmmod` any
|
||||
# already-loaded modules that are now blacklisted before proceeding to modprobe
|
||||
# wl itself.
|
||||
|
|
@ -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"
|
||||
|
|
@ -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/)"
|
||||
|
|
@ -1,5 +1,2 @@
|
|||
#
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
[Journal]
|
||||
Storage=volatile
|
||||
|
|
|
|||
|
|
@ -1,6 +1,3 @@
|
|||
#
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
[Login]
|
||||
HandleSuspendKey=ignore
|
||||
HandleHibernateKey=ignore
|
||||
|
|
|
|||
|
|
@ -1,6 +1,3 @@
|
|||
#
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
[Match]
|
||||
Name=en*
|
||||
Name=eth*
|
||||
|
|
|
|||
|
|
@ -1,6 +1,3 @@
|
|||
#
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
[Match]
|
||||
Name=wlp*
|
||||
Name=wlan*
|
||||
|
|
|
|||
|
|
@ -1,6 +1,3 @@
|
|||
#
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
[Unit]
|
||||
Description=Temporary /etc/pacman.d/gnupg directory
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,3 @@
|
|||
#
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
[Unit]
|
||||
Description=Initializes Pacman keyring
|
||||
Wants=haveged.service
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
#!/bin/env bash
|
||||
#
|
||||
# Warning: customize_airootfs.sh is deprecated! Support for it will be removed in a future archiso version.
|
||||
|
||||
set -o errexit
|
||||
set -o errtrace
|
||||
set -o nounset
|
||||
set -o pipefail
|
||||
|
||||
sed -i 's/#\(en_US\.UTF-8\)/\1/' /etc/locale.gen
|
||||
locale-gen
|
||||
|
||||
|
|
@ -1,6 +1,3 @@
|
|||
#
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
title Arch Linux (x86_64, UEFI)
|
||||
linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
|
||||
initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
title Arch Linux (x86_64, UEFI) Copy to RAM
|
||||
linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
|
||||
initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
|
||||
options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram
|
||||
|
|
@ -1,5 +1,2 @@
|
|||
#
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
timeout 3
|
||||
default archiso-x86_64-linux.conf
|
||||
default 01-archiso-x86_64-linux.conf
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
[options]
|
||||
HoldPkg = pacman glibc
|
||||
Architecture = auto
|
||||
ParallelDownloads = 5
|
||||
SigLevel = Required DatabaseOptional
|
||||
LocalFileSigLevel = Optional
|
||||
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ iso_publisher="SUPPORT_URL"
|
|||
iso_application="KIT_NAME_FULL Linux Environment"
|
||||
iso_version="$(date +%Y-%m-%d)"
|
||||
install_dir="arch"
|
||||
buildmodes=('iso')
|
||||
bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' 'uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito')
|
||||
arch="x86_64"
|
||||
pacman_conf="pacman.conf"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
SERIAL 0 38400
|
||||
SERIAL 0 115200
|
||||
UI vesamenu.c32
|
||||
MENU TITLE _______
|
||||
MENU BACKGROUND syslinux.png
|
||||
|
|
|
|||
Loading…
Reference in a new issue