archiso 70 to 71
This commit is contained in:
parent
cb07706488
commit
487929cd1a
14 changed files with 30 additions and 35 deletions
|
@ -9,7 +9,7 @@ https://www.archlinux.org/packages/extra/any/archiso/
|
||||||
We are now using this version
|
We are now using this version
|
||||||
|
|
||||||
|
|
||||||
archiso-version=archiso 70-1
|
archiso-version=archiso 71-1
|
||||||
|
|
||||||
|
|
||||||
sudo pacman -Q archiso and you will know your version
|
sudo pacman -Q archiso and you will know your version
|
||||||
|
|
|
@ -7,6 +7,7 @@ Name=eth*
|
||||||
|
|
||||||
[Network]
|
[Network]
|
||||||
DHCP=yes
|
DHCP=yes
|
||||||
|
MulticastDNS=yes
|
||||||
IPv6PrivacyExtensions=yes
|
IPv6PrivacyExtensions=yes
|
||||||
|
|
||||||
# systemd-networkd does not set per-interface-type default route metrics
|
# systemd-networkd does not set per-interface-type default route metrics
|
||||||
|
|
|
@ -3,6 +3,7 @@ Name=wl*
|
||||||
|
|
||||||
[Network]
|
[Network]
|
||||||
DHCP=yes
|
DHCP=yes
|
||||||
|
MulticastDNS=yes
|
||||||
IPv6PrivacyExtensions=yes
|
IPv6PrivacyExtensions=yes
|
||||||
|
|
||||||
# systemd-networkd does not set per-interface-type default route metrics
|
# systemd-networkd does not set per-interface-type default route metrics
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
# Default systemd-resolved configuration for archiso
|
||||||
|
|
||||||
|
[Resolve]
|
||||||
|
MulticastDNS=yes
|
|
@ -16,7 +16,13 @@ automated_script ()
|
||||||
script="$(script_cmdline)"
|
script="$(script_cmdline)"
|
||||||
if [[ -n "${script}" && ! -x /tmp/startup_script ]]; then
|
if [[ -n "${script}" && ! -x /tmp/startup_script ]]; then
|
||||||
if [[ "${script}" =~ ^((http|https|ftp)://) ]]; then
|
if [[ "${script}" =~ ^((http|https|ftp)://) ]]; then
|
||||||
curl "${script}" --location --retry-connrefused --retry 10 -s -o /tmp/startup_script >/dev/null
|
# there's no synchronization for network availability before executing this script
|
||||||
|
printf '%s: waiting for network-online.target\n' "$0"
|
||||||
|
until systemctl --quiet is-active network-online.target; do
|
||||||
|
sleep 1
|
||||||
|
done
|
||||||
|
printf '%s: downloading %s\n' "$0" "${script}"
|
||||||
|
curl "${script}" --location --retry-connrefused --retry 10 -s -o /tmp/startup_script
|
||||||
rt=$?
|
rt=$?
|
||||||
else
|
else
|
||||||
cp "${script}" /tmp/startup_script
|
cp "${script}" /tmp/startup_script
|
||||||
|
@ -24,6 +30,9 @@ automated_script ()
|
||||||
fi
|
fi
|
||||||
if [[ ${rt} -eq 0 ]]; then
|
if [[ ${rt} -eq 0 ]]; then
|
||||||
chmod +x /tmp/startup_script
|
chmod +x /tmp/startup_script
|
||||||
|
printf '%s: executing automated script\n' "$0"
|
||||||
|
# note that script is executed when other services (like pacman-init) may be still in progress, please
|
||||||
|
# synchronize to "systemctl is-system-running --wait" when your script depends on other services
|
||||||
/tmp/startup_script
|
/tmp/startup_script
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -4,4 +4,4 @@ linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
|
||||||
initrd /%INSTALL_DIR%/boot/intel-ucode.img
|
initrd /%INSTALL_DIR%/boot/intel-ucode.img
|
||||||
initrd /%INSTALL_DIR%/boot/amd-ucode.img
|
initrd /%INSTALL_DIR%/boot/amd-ucode.img
|
||||||
initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
|
initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
|
||||||
options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=4G copytoram=n
|
options archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% cow_spacesize=4G copytoram=n
|
||||||
|
|
|
@ -4,4 +4,4 @@ linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
|
||||||
initrd /%INSTALL_DIR%/boot/intel-ucode.img
|
initrd /%INSTALL_DIR%/boot/intel-ucode.img
|
||||||
initrd /%INSTALL_DIR%/boot/amd-ucode.img
|
initrd /%INSTALL_DIR%/boot/amd-ucode.img
|
||||||
initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
|
initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
|
||||||
options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=4G copytoram=n accessibility=on
|
options archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% cow_spacesize=4G copytoram=n accessibility=on
|
||||||
|
|
|
@ -56,16 +56,16 @@ menuentry "Alci install medium with speakup screen reader (x86_64, UEFI)" --hotk
|
||||||
|
|
||||||
if [ "${grub_platform}" == "efi" ]; then
|
if [ "${grub_platform}" == "efi" ]; then
|
||||||
if [ "${grub_cpu}" == "x86_64" ]; then
|
if [ "${grub_cpu}" == "x86_64" ]; then
|
||||||
menuentry "Run Memtest86+ (RAM test)" --class memtest86 --class gnu --class tool {
|
menuentry "Run Memtest86+ (RAM test)" --class memtest86 --class memtest --class gnu --class tool {
|
||||||
set gfxpayload=800x600,1024x768
|
set gfxpayload=800x600,1024x768
|
||||||
linux /boot/memtest86+/memtest.efi
|
linux /boot/memtest86+/memtest.efi
|
||||||
}
|
}
|
||||||
menuentry "UEFI Shell" {
|
menuentry "UEFI Shell" --class efi {
|
||||||
insmod chain
|
insmod chain
|
||||||
chainloader /shellx64.efi
|
chainloader /shellx64.efi
|
||||||
}
|
}
|
||||||
elif [ "${grub_cpu}" == "i386" ]; then
|
elif [ "${grub_cpu}" == "i386" ]; then
|
||||||
menuentry "UEFI Shell" {
|
menuentry "UEFI Shell" --class efi {
|
||||||
insmod chain
|
insmod chain
|
||||||
chainloader /shellia32.efi
|
chainloader /shellia32.efi
|
||||||
}
|
}
|
||||||
|
|
|
@ -28,6 +28,7 @@ ethtool
|
||||||
exfatprogs
|
exfatprogs
|
||||||
f2fs-tools
|
f2fs-tools
|
||||||
fatresize
|
fatresize
|
||||||
|
foot-terminfo
|
||||||
fsarchiver
|
fsarchiver
|
||||||
gnu-netcat
|
gnu-netcat
|
||||||
gpart
|
gpart
|
||||||
|
@ -114,6 +115,7 @@ usbutils
|
||||||
vim
|
vim
|
||||||
virtualbox-guest-utils-nox
|
virtualbox-guest-utils-nox
|
||||||
vpnc
|
vpnc
|
||||||
|
wezterm-terminfo
|
||||||
wireless-regdb
|
wireless-regdb
|
||||||
wireless_tools
|
wireless_tools
|
||||||
wpa_supplicant
|
wpa_supplicant
|
||||||
|
@ -267,4 +269,4 @@ mkinitcpio-openswap
|
||||||
git
|
git
|
||||||
|
|
||||||
#grub theme
|
#grub theme
|
||||||
alci-grub-theme-git
|
alci-grub-theme-git
|
||||||
|
|
|
@ -2,8 +2,6 @@
|
||||||
# /etc/pacman.conf
|
# /etc/pacman.conf
|
||||||
#
|
#
|
||||||
# See the pacman.conf(5) manpage for option and repository directives
|
# See the pacman.conf(5) manpage for option and repository directives
|
||||||
#
|
|
||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# GENERAL OPTIONS
|
# GENERAL OPTIONS
|
||||||
|
|
|
@ -6,7 +6,7 @@ ENDTEXT
|
||||||
MENU LABEL Arch Linux install medium (x86_64, NBD)
|
MENU LABEL Arch Linux install medium (x86_64, NBD)
|
||||||
LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
|
LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
|
||||||
INITRD ::/%INSTALL_DIR%/boot/intel-ucode.img,::/%INSTALL_DIR%/boot/amd-ucode.img,::/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
|
INITRD ::/%INSTALL_DIR%/boot/intel-ucode.img,::/%INSTALL_DIR%/boot/amd-ucode.img,::/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
|
||||||
APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver} cms_verify=y
|
APPEND archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% archiso_nbd_srv=${pxeserver} cms_verify=y
|
||||||
SYSAPPEND 3
|
SYSAPPEND 3
|
||||||
|
|
||||||
LABEL arch64_nfs
|
LABEL arch64_nfs
|
||||||
|
|
|
@ -6,7 +6,7 @@ ENDTEXT
|
||||||
MENU LABEL Arch Linux install medium (x86_64, BIOS)
|
MENU LABEL Arch Linux install medium (x86_64, BIOS)
|
||||||
LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
|
LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
|
||||||
INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
|
INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
|
||||||
APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=4G copytoram=n
|
APPEND archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% cow_spacesize=4G copytoram=n
|
||||||
|
|
||||||
# Accessibility boot option
|
# Accessibility boot option
|
||||||
LABEL arch64speech
|
LABEL arch64speech
|
||||||
|
@ -17,4 +17,4 @@ ENDTEXT
|
||||||
MENU LABEL Arch Linux install medium (x86_64, BIOS) with ^speech
|
MENU LABEL Arch Linux install medium (x86_64, BIOS) with ^speech
|
||||||
LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
|
LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
|
||||||
INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
|
INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
|
||||||
APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% accessibility=on cow_spacesize=4G copytoram=n
|
APPEND archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% accessibility=on cow_spacesize=4G copytoram=n
|
||||||
|
|
|
@ -24,18 +24,8 @@ tput sgr0
|
||||||
echo "################################################################## "
|
echo "################################################################## "
|
||||||
echo
|
echo
|
||||||
|
|
||||||
#Let us set the desktop"
|
|
||||||
#First letter of desktop is small letter
|
|
||||||
|
|
||||||
#desktop="xfce"
|
|
||||||
#lightdmDesktop="xfce"
|
|
||||||
|
|
||||||
#arcolinuxVersion='v21.03.1'
|
|
||||||
|
|
||||||
#isoLabel='arcolinux-next-'$arcolinuxVersion'-x86_64.iso'
|
|
||||||
|
|
||||||
# setting of the general parameters
|
# setting of the general parameters
|
||||||
archisoRequiredVersion="archiso 70-1"
|
archisoRequiredVersion="archiso 71-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)
|
||||||
|
|
|
@ -24,18 +24,8 @@ tput sgr0
|
||||||
echo "################################################################## "
|
echo "################################################################## "
|
||||||
echo
|
echo
|
||||||
|
|
||||||
#Let us set the desktop"
|
|
||||||
#First letter of desktop is small letter
|
|
||||||
|
|
||||||
#desktop="xfce"
|
|
||||||
#lightdmDesktop="xfce"
|
|
||||||
|
|
||||||
#arcolinuxVersion='v21.03.1'
|
|
||||||
|
|
||||||
#isoLabel='arcolinux-next-'$arcolinuxVersion'-x86_64.iso'
|
|
||||||
|
|
||||||
# setting of the general parameters
|
# setting of the general parameters
|
||||||
archisoRequiredVersion="archiso 70-1"
|
archisoRequiredVersion="archiso 71-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