theupriser/steamify-cachyos-live-iso
1
0 Fork 0
mirror of https://github.com/theupriser/steamify-cachyos-live-iso.git synced 2026-10-02 15:10:26 +02:00
Code Issues Actions Packages Projects Releases 3 Wiki Activity

🔥 update

Browse Source
This commit is contained in:
Vladislav Nepogodin committed 2021-08-31 04:16:36 +04:00
1 parent 7c2275eda7
commit 36d8435c07
48 files changed
+1356 -1067
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

LICENSE
+7 -8
View File
@@ -1,7 +1,7 @@
GNU GENERAL PUBLIC LICENSE GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007 Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed. of this license document, but changing it is not allowed.
@@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found. the "copyright" line and a pointer to where the full notice is found.
{one line to give the program's name and a brief idea of what it does.} <one line to give the program's name and a brief idea of what it does.>
Copyright (C) {year} {name of author} Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@@ -645,14 +645,14 @@ the "copyright" line and a pointer to where the full notice is found.
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <https://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail. Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode: notice like this when it starts in an interactive mode:
{project} Copyright (C) {year} {fullname} <program> Copyright (C) <year> <name of author>
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details. under certain conditions; type `show c' for details.
@@ -664,12 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school, You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary. if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see For more information on this, and how to apply and follow the GNU GPL, see
<http://www.gnu.org/licenses/>. <https://www.gnu.org/licenses/>.
The GNU General Public License does not permit incorporating your program The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>. <https://www.gnu.org/licenses/why-not-lgpl.html>.
README.md
+1 -1
View File
@@ -16,6 +16,6 @@ Clone:\
`sudo ./fix_permissions.sh` `sudo ./fix_permissions.sh`
## Build ## Build
`sudo ./build.sh -v` `sudo ./mkarchiso /path/to/profile`
## The iso appears at out folder ## The iso appears at out folder
airootfs/etc/environment
+3 -1
View File
@@ -4,5 +4,7 @@
# #
# Syntax: simple "KEY=VAL" pairs on separate lines # Syntax: simple "KEY=VAL" pairs on separate lines
# #
# QT_QPA_PLATFORMTHEME=qt5ct QT_QPA_PLATFORMTHEME=qt5ct
#QT_STYLE_OVERRIDE=kvantum
BROWSER=cachy-browser BROWSER=cachy-browser
EDITOR=nano
airootfs/etc/group
Executable
+8
View File
@@ -0,0 +1,8 @@
root:x:0:root
adm:x:4:liveuser
wheel:x:10:liveuser
uucp:x:14:liveuser
nopasswdlogin:x:966:liveuser
rfkill:x:983:liveuser
sys:x:3:bin,liveuser
liveuser:x:1000:
airootfs/etc/gshadow
Executable
+2
View File
@@ -0,0 +1,2 @@
root:!*::root
liveuser:!*::
airootfs/etc/hostname
+1 -1
View File
@@ -1,3 +1,3 @@
# #
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
archiso CachyOS
airootfs/etc/mkinitcpio.conf
+1 -1
View File
@@ -55,7 +55,7 @@ FILES=()
HOOKS=(base udev memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block filesystems keyboard) HOOKS=(base udev memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block filesystems keyboard)
# COMPRESSION # COMPRESSION
# Use this to compress the initramfs image. By default, zstd compression # Use this to compress the initramfs image. By default, gzip compression
# is used. Use 'cat' to create an uncompressed image. # is used. Use 'cat' to create an uncompressed image.
COMPRESSION="zstd" COMPRESSION="zstd"
#COMPRESSION="gzip" #COMPRESSION="gzip"
airootfs/etc/mkinitcpio.d/linux.preset
+1 -1
View File
@@ -8,4 +8,4 @@ PRESETS=('archiso')
ALL_kver='/boot/vmlinuz-linux' ALL_kver='/boot/vmlinuz-linux'
ALL_config='/etc/mkinitcpio.conf' ALL_config='/etc/mkinitcpio.conf'
archiso_image="/boot/archiso.img" archiso_image="/boot/initramfs-linux.img"
airootfs/etc/motd
+8 -7
View File
@@ -1,18 +1,19 @@
This ISO is based on Arch-ISO modified hugely to provide Installation Environment for CachyOS. This ISO is based on Arch-ISO modified hugely to provide Installation Environment for CachyOS.
https://cachyos.org https://cachyos.org
Arch-ISO Source:
https://gitlab.archlinux.org/archlinux/archiso
CachyOS-archiso Sources: CachyOS-archiso Sources:
https://gitlab.com/cachyos/cachyos-archiso https://gitlab.com/cachyos/cachyos-archiso
Live environment will start now and let you install CachyOS to disk, or tryout XFCE4-Desktop from Live-Session. Arch-ISO Source:
https://gitlab.archlinux.org/archlinux/archiso
Bugs can be reported here: Calamares as our installer:
https://forum.endeavouros.com/c/Arch-based-related-questions/bug-reports https://github.com/calamares/calamares
Live environment will start now and let you install CachyOS to disk, or tryout Plasma-Desktop from Live-Session.
Getting help at the forum: https://forum.cachyos.org Getting help at the forum: https://forum.cachyos.org
Welcome to your cachy! Welcome to your cachy
---
airootfs/etc/pacman.conf
+5 -4
View File
@@ -16,7 +16,7 @@
#GPGDir = /etc/pacman.d/gnupg/ #GPGDir = /etc/pacman.d/gnupg/
#HookDir = /etc/pacman.d/hooks/ #HookDir = /etc/pacman.d/hooks/
HoldPkg = pacman glibc HoldPkg = pacman glibc
#XferCommand = /usr/bin/curl -C - -f %u > %o #XferCommand = /usr/bin/curl -L -C - -f -o %o %u
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
#CleanMethod = KeepInstalled #CleanMethod = KeepInstalled
#UseDelta = 0.7 #UseDelta = 0.7
@@ -33,10 +33,11 @@ Architecture = auto
#UseSyslog #UseSyslog
Color Color
ILoveCandy ILoveCandy
#TotalDownload #NoProgressBar
# We cannot check disk space from within a chroot environment
#CheckSpace #CheckSpace
#VerbosePkgLists VerbosePkgLists
DisableDownloadTimeout
ParallelDownloads = 10
# By default, pacman accepts packages signed by keys that its local keyring # By default, pacman accepts packages signed by keys that its local keyring
# trusts (see pacman-key and its man page), as well as unsigned packages. # trusts (see pacman-key and its man page), as well as unsigned packages.
airootfs/etc/passwd
+1 -1
View File
@@ -1 +1 @@
root:x:0:0:root:/root:/usr/bin/zsh root:x:0:0:root:/root:/bin/bash
airootfs/etc/skel/.bashrc
+14 -4
View File
@@ -164,6 +164,19 @@ _open_files_for_editing() {
done done
} }
_Pacdiff() {
local differ pacdiff=/usr/bin/pacdiff
if [ -n "$(echo q | DIFFPROG=diff $pacdiff)" ] ; then
for differ in kdiff3 meld diffuse ; do
if [ -x /usr/bin/$differ ] ; then
DIFFPROG=$differ su-c_wrapper $pacdiff
break
fi
done
fi
}
#------------------------------------------------------------ #------------------------------------------------------------
## Aliases for the functions above. ## Aliases for the functions above.
@@ -171,8 +184,5 @@ _open_files_for_editing() {
## ##
# alias ef='_open_files_for_editing' # 'ef' opens given file(s) for editing # alias ef='_open_files_for_editing' # 'ef' opens given file(s) for editing
# alias pacdiff=_Pacdiff
## Other potentially useful aliases.
#
# alias pacdiff=eos-pacdiff
################################################################################ ################################################################################
airootfs/etc/skel/.config/Kvantum/kvantum.kvconfig
Executable
+2
View File
@@ -0,0 +1,2 @@
[General]
theme=KvArc
airootfs/etc/skel/.config/qt5ct/qt5ct.conf
Executable
+28
View File
@@ -0,0 +1,28 @@
[Appearance]
color_scheme_path=/usr/share/qt5ct/colors/darker.conf
custom_palette=false
icon_theme=Arc-X-D
standard_dialogs=default
style=kvantum
[Fonts]
fixed=@Variant(\0\0\0@\0\0\0\x1e\0S\0o\0u\0r\0\x63\0\x65\0 \0\x43\0o\0\x64\0\x65\0 \0P\0r\0o@$\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10)
general=@Variant(\0\0\0@\0\0\0\x12\0N\0o\0t\0o\0 \0S\0\x61\0n\0s@$\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10)
[Interface]
activate_item_on_single_click=1
buttonbox_layout=0
cursor_flash_time=1000
dialog_buttons_have_icons=1
double_click_interval=400
gui_effects=@Invalid()
keyboard_scheme=2
menus_have_icons=true
show_shortcuts_in_context_menus=true
stylesheets=/usr/share/qt5ct/qss/scrollbar-simple.qss, /usr/share/qt5ct/qss/sliders-simple.qss, /usr/share/qt5ct/qss/tooltip-simple.qss, /usr/share/qt5ct/qss/traynotification-simple.qss
toolbutton_style=4
underline_shortcut=1
wheel_scroll_lines=3
[SettingsWindow]
geometry="@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\x6\xc0\0\0\x3;\0\0\t\xa2\0\0\x6\xe\0\0\x6\xc2\0\0\x3W\0\0\t\xa0\0\0\x6\f\0\0\0\0\0\0\0\0\a\x80\0\0\x6\xc2\0\0\x3W\0\0\t\xa0\0\0\x6\f)"
airootfs/etc/skel/.gnupg/gpg.conf
Executable
+7
View File
@@ -0,0 +1,7 @@
no-greeting
no-permission-warning
lock-never
keyserver-options timeout=10
keyserver-options import-clean
keyserver-options no-self-sigs-only
keyserver hkp://keys.openpgp.org
airootfs/etc/skel/.xprofile
-1
View File
@@ -1,2 +1 @@
xcompmgr &
xset s off -dpms & xset s off -dpms &
airootfs/etc/skel/xed.dconf
Executable
+6
View File
@@ -0,0 +1,6 @@
[org/x/editor/preferences/editor]
bracket-matching=false
display-line-numbers=true
prefer-dark-theme=true
scheme='cobalt'
wrap-mode='none'
airootfs/etc/systemd/network/20-ethernet.network
-13
View File
@@ -1,13 +0,0 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
[Match]
Name=en*
Name=eth*
[Network]
DHCP=yes
IPv6PrivacyExtensions=yes
[DHCP]
RouteMetric=512
airootfs/etc/systemd/network/20-wireless.network
-13
View File
@@ -1,13 +0,0 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
[Match]
Name=wlp*
Name=wlan*
[Network]
DHCP=yes
IPv6PrivacyExtensions=yes
[DHCP]
RouteMetric=1024
airootfs/etc/systemd/system/dbus-org.freedesktop.network1.service
-1
View File
@@ -1 +0,0 @@
/usr/lib/systemd/system/systemd-networkd.service
airootfs/etc/systemd/system/dbus-org.freedesktop.resolve1.service
-1
View File
@@ -1 +0,0 @@
/usr/lib/systemd/system/systemd-resolved.service
airootfs/etc/systemd/system/multi-user.target.wants/iwd.service
-1
View File
@@ -1 +0,0 @@
/usr/lib/systemd/system/iwd.service
airootfs/etc/systemd/system/multi-user.target.wants/systemd-networkd.service
-1
View File
@@ -1 +0,0 @@
/usr/lib/systemd/system/systemd-networkd.service
airootfs/etc/systemd/system/multi-user.target.wants/systemd-resolved.service
-1
View File
@@ -1 +0,0 @@
/usr/lib/systemd/system/systemd-resolved.service
airootfs/etc/systemd/system/sockets.target.wants/systemd-networkd.socket
-1
View File
@@ -1 +0,0 @@
/usr/lib/systemd/system/systemd-networkd.socket
airootfs/root/.zlogin
+5
View File
@@ -1 +1,6 @@
# fix for screen readers
if grep -Fq 'accessibility=' /proc/cmdline &> /dev/null; then
setopt SINGLE_LINE_ZLE
fi
~/.automated_script.sh ~/.automated_script.sh
build.sh
-345
View File
@@ -1,345 +0,0 @@
#!/usr/bin/env bash
#
# SPDX-License-Identifier: GPL-3.0-or-later
set -e -u
iso_name=cachyos
iso_label="CACHYOS"
iso_publisher="CachyOS GNU/Linux <https://cachyos.org>"
iso_application="CachyOS GNU/Linux Live/Rescue CD"
iso_version=$(date +%Y.%m.%d)
install_dir=arch
work_dir=work
out_dir=out
gpg_key=""
verbose=""
script_path="$( cd -P "$( dirname "$(readlink -f "$0")" )" && pwd )"
MKARCHISO=$script_path/mkarchiso
umask 0022
_usage ()
{
echo "usage ${0} [options]"
echo
echo " General options:"
echo " -N <iso_name> Set an iso filename (prefix)"
echo " Default: ${iso_name}"
echo " -V <iso_version> Set an iso version (in filename)"
echo " Default: ${iso_version}"
echo " -L <iso_label> Set an iso label (disk label)"
echo " Default: ${iso_label}"
echo " -P <publisher> Set a publisher for the disk"
echo " Default: '${iso_publisher}'"
echo " -A <application> Set an application name for the disk"
echo " Default: '${iso_application}'"
echo " -D <install_dir> Set an install_dir (directory inside iso)"
echo " Default: ${install_dir}"
echo " -w <work_dir> Set the working directory"
echo " Default: ${work_dir}"
echo " -o <out_dir> Set the output directory"
echo " Default: ${out_dir}"
echo " -v Enable verbose output"
echo " -h This help message"
exit "${1}"
}
# Helper function to run make_*() only one time per architecture.
run_once() {
if [[ ! -e "${work_dir}/build.${1}" ]]; then
"$1"
touch "${work_dir}/build.${1}"
fi
}
bypass_umount_error(){
# Not used for now
umount -l $script_path/work/x86_64/airootfs/proc $script_path/work/x86_64/airootfs/dev || true
}
# Setup custom pacman.conf with current cache directories.
make_pacman_conf() {
local _cache_dirs
_cache_dirs=("$(pacman -v 2>&1 | grep '^Cache Dirs:' | sed 's/Cache Dirs:\s*//g')")
sed -r "s|^#?\\s*CacheDir.+|CacheDir = $(echo -n "${_cache_dirs[@]}")|g" \
"${script_path}/pacman.conf" > "${work_dir}/pacman.conf"
}
# Prepare working directory and copy custom airootfs files (airootfs)
make_custom_airootfs() {
local _airootfs="${work_dir}/x86_64/airootfs"
mkdir -p -- "${_airootfs}"
if [[ -d "${script_path}/airootfs" ]]; then
cp -af --no-preserve=ownership -- "${script_path}/airootfs/." "${_airootfs}"
[[ -e "${_airootfs}/etc/shadow" ]] && chmod -f 0400 -- "${_airootfs}/etc/shadow"
[[ -e "${_airootfs}/etc/gshadow" ]] && chmod -f 0400 -- "${_airootfs}/etc/gshadow"
mkdir -p "${_airootfs}/usr/lib"
echo "VERSION=$iso_version" >> "${_airootfs}/usr/lib/cachtyos-release"
# Set up user home directories and permissions
if [[ -e "${_airootfs}/etc/passwd" ]]; then
while IFS=':' read -a passwd -r; do
[[ "${passwd[5]}" == '/' ]] && continue
if [[ -d "${_airootfs}${passwd[5]}" ]]; then
chown -hR -- "${passwd[2]}:${passwd[3]}" "${_airootfs}${passwd[5]}"
chmod -f 0750 -- "${_airootfs}${passwd[5]}"
else
install -d -m 0750 -o "${passwd[2]}" -g "${passwd[3]}" -- "${_airootfs}${passwd[5]}"
fi
done < "${_airootfs}/etc/passwd"
fi
fi
}
# Packages (airootfs)
make_packages() {
if [[ "${gpg_key}" ]]; then
gpg --export "${gpg_key}" > "${work_dir}/gpgkey"
exec 17<>"${work_dir}/gpgkey"
fi
if [ -n "${verbose}" ]; then
ARCHISO_GNUPG_FD="${gpg_key:+17}" $MKARCHISO -v -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
-p "$(grep -h -v '^#' "${script_path}/packages.x86_64"| sed ':a;N;$!ba;s/\n/ /g')" install
else
ARCHISO_GNUPG_FD="${gpg_key:+17}" $MKARCHISO -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
-p "$(grep -h -v '^#' "${script_path}/packages.x86_64"| sed ':a;N;$!ba;s/\n/ /g')" install
fi
if [[ "${gpg_key}" ]]; then
exec 17<&-
fi
}
# Copy mkinitcpio archiso hooks and build initramfs (airootfs)
make_setup_mkinitcpio() {
local _hook
mkdir -p ${work_dir}/x86_64/airootfs/etc/initcpio/hooks
mkdir -p ${work_dir}/x86_64/airootfs/etc/initcpio/install
for _hook in archiso archiso_shutdown archiso_loop_mnt; do
cp /usr/lib/initcpio/hooks/${_hook} ${work_dir}/x86_64/airootfs/etc/initcpio/hooks
cp /usr/lib/initcpio/install/${_hook} ${work_dir}/x86_64/airootfs/etc/initcpio/install
done
sed -i "s|/usr/lib/initcpio/|/etc/initcpio/|g" ${work_dir}/x86_64/airootfs/etc/initcpio/install/archiso_shutdown
cp /usr/lib/initcpio/install/archiso_kms ${work_dir}/x86_64/airootfs/etc/initcpio/install
cp /usr/lib/initcpio/archiso_shutdown ${work_dir}/x86_64/airootfs/etc/initcpio
cp ${script_path}/mkinitcpio.conf ${work_dir}/x86_64/airootfs/etc/mkinitcpio-archiso.conf
}
# Customize installation (airootfs)
make_customize_airootfs() {
if [[ -e "${script_path}/airootfs/etc/passwd" ]]; then
while IFS=':' read -a passwd -r; do
[[ "${passwd[5]}" == '/' ]] && continue
cp -RdT --preserve=mode,timestamps,links -- "${work_dir}/x86_64/airootfs/etc/skel" "${work_dir}/x86_64/airootfs${passwd[5]}"
chown -hR -- "${passwd[2]}:${passwd[3]}" "${work_dir}/x86_64/airootfs${passwd[5]}"
done < "${script_path}/airootfs/etc/passwd"
fi
if [[ -e "${work_dir}/x86_64/airootfs/root/customize_airootfs.sh" ]]; then
if [ -n "${verbose}" ]; then
$MKARCHISO -v -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
-r '/root/customize_airootfs.sh' run
else
$MKARCHISO -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
-r '/root/customize_airootfs.sh' run
fi
rm "${work_dir}/x86_64/airootfs/root/customize_airootfs.sh"
fi
}
# Prepare kernel/initramfs ${install_dir}/boot/
make_boot() {
mkdir -p "${work_dir}/iso/${install_dir}/boot/x86_64"
cp "${work_dir}/x86_64/airootfs/boot/archiso.img" "${work_dir}/iso/${install_dir}/boot/x86_64/"
cp "${work_dir}/x86_64/airootfs/boot/vmlinuz-linux" "${work_dir}/iso/${install_dir}/boot/x86_64/"
}
# Add other aditional/extra files to ${install_dir}/boot/
make_boot_extra() {
if [[ -e "${work_dir}/x86_64/airootfs/boot/memtest86+/memtest.bin" ]]; then
# rename for PXE: https://wiki.archlinux.org/index.php/Syslinux#Using_memtest
cp "${work_dir}/x86_64/airootfs/boot/memtest86+/memtest.bin" "${work_dir}/iso/${install_dir}/boot/memtest"
mkdir -p "${work_dir}/iso/${install_dir}/boot/licenses/memtest86+/"
cp "${work_dir}/x86_64/airootfs/usr/share/licenses/common/GPL2/license.txt" \
"${work_dir}/iso/${install_dir}/boot/licenses/memtest86+/"
fi
if [[ -e "${work_dir}/x86_64/airootfs/boot/intel-ucode.img" ]]; then
cp "${work_dir}/x86_64/airootfs/boot/intel-ucode.img" "${work_dir}/iso/${install_dir}/boot/"
mkdir -p "${work_dir}/iso/${install_dir}/boot/licenses/intel-ucode/"
cp "${work_dir}/x86_64/airootfs/usr/share/licenses/intel-ucode/"* \
"${work_dir}/iso/${install_dir}/boot/licenses/intel-ucode/"
fi
if [[ -e "${work_dir}/x86_64/airootfs/boot/amd-ucode.img" ]]; then
cp "${work_dir}/x86_64/airootfs/boot/amd-ucode.img" "${work_dir}/iso/${install_dir}/boot/"
mkdir -p "${work_dir}/iso/${install_dir}/boot/licenses/amd-ucode/"
cp "${work_dir}/x86_64/airootfs/usr/share/licenses/amd-ucode/"* \
"${work_dir}/iso/${install_dir}/boot/licenses/amd-ucode/"
fi
}
# Prepare /${install_dir}/boot/syslinux
make_syslinux() {
_uname_r=$(file -b "${work_dir}/x86_64/airootfs/boot/vmlinuz-linux"| awk 'f{print;f=0} /version/{f=1}' RS=' ')
mkdir -p "${work_dir}/iso/${install_dir}/boot/syslinux"
for _cfg in "${script_path}/syslinux/"*.cfg; do
sed "s|%ARCHISO_LABEL%|${iso_label}|g;
s|%INSTALL_DIR%|${install_dir}|g" "${_cfg}" > "${work_dir}/iso/${install_dir}/boot/syslinux/${_cfg##*/}"
done
cp "${script_path}/syslinux/splash.png" "${work_dir}/iso/${install_dir}/boot/syslinux/"
cp "${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/"*.c32 "${work_dir}/iso/${install_dir}/boot/syslinux/"
cp "${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/lpxelinux.0" "${work_dir}/iso/${install_dir}/boot/syslinux/"
cp "${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/memdisk" "${work_dir}/iso/${install_dir}/boot/syslinux/"
mkdir -p "${work_dir}/iso/${install_dir}/boot/syslinux/hdt"
gzip -c -9 "${work_dir}/x86_64/airootfs/usr/share/hwdata/pci.ids" > \
"${work_dir}/iso/${install_dir}/boot/syslinux/hdt/pciids.gz"
gzip -c -9 "${work_dir}/x86_64/airootfs/usr/lib/modules/${_uname_r}/modules.alias" > \
"${work_dir}/iso/${install_dir}/boot/syslinux/hdt/modalias.gz"
}
# Prepare /isolinux
make_isolinux() {
mkdir -p "${work_dir}/iso/isolinux"
sed "s|%INSTALL_DIR%|${install_dir}|g" \
"${script_path}/isolinux/isolinux.cfg" > "${work_dir}/iso/isolinux/isolinux.cfg"
cp "${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/isolinux.bin" "${work_dir}/iso/isolinux/"
cp "${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/isohdpfx.bin" "${work_dir}/iso/isolinux/"
cp "${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/ldlinux.c32" "${work_dir}/iso/isolinux/"
}
# Prepare /EFI
make_efi() {
mkdir -p "${work_dir}/iso/EFI/boot"
cp "${work_dir}/x86_64/airootfs/usr/lib/systemd/boot/efi/systemd-bootx64.efi" \
"${work_dir}/iso/EFI/boot/bootx64.efi"
mkdir -p "${work_dir}/iso/loader/entries"
cp "${script_path}/efiboot/loader/loader.conf" "${work_dir}/iso/loader/"
sed "s|%ARCHISO_LABEL%|${iso_label}|g;
s|%INSTALL_DIR%|${install_dir}|g" \
"${script_path}/efiboot/loader/entries/archiso-x86_64-usb.conf" > \
"${work_dir}/iso/loader/entries/archiso-x86_64.conf"
sed "s|%ARCHISO_LABEL%|${iso_label}|g;
s|%INSTALL_DIR%|${install_dir}|g" \
"${script_path}/efiboot/loader/entries/archiso-x86_64-usb-nonfree.conf" > \
"${work_dir}/iso/loader/entries/archiso-x86_64-nonfree.conf"
# edk2-shell based UEFI shell
# shellx64.efi is picked up automatically when on /
cp "${work_dir}/x86_64/airootfs/usr/share/edk2-shell/x64/Shell_Full.efi" "${work_dir}/iso/shellx64.efi"
}
# Prepare efiboot.img::/EFI for "El Torito" EFI boot mode
make_efiboot() {
mkdir -p "${work_dir}/iso/EFI/archiso"
truncate -s 100M "${work_dir}/iso/EFI/archiso/efiboot.img"
mkfs.fat -n ARCHISO_EFI "${work_dir}/iso/EFI/archiso/efiboot.img"
mkdir -p "${work_dir}/efiboot"
mount "${work_dir}/iso/EFI/archiso/efiboot.img" "${work_dir}/efiboot"
mkdir -p "${work_dir}/efiboot/EFI/archiso"
cp "${work_dir}/iso/${install_dir}/boot/x86_64/vmlinuz-linux" "${work_dir}/efiboot/EFI/archiso/"
cp "${work_dir}/iso/${install_dir}/boot/x86_64/archiso.img" "${work_dir}/efiboot/EFI/archiso/"
cp "${work_dir}/iso/${install_dir}/boot/intel-ucode.img" "${work_dir}/efiboot/EFI/archiso/"
cp "${work_dir}/iso/${install_dir}/boot/amd-ucode.img" "${work_dir}/efiboot/EFI/archiso/"
mkdir -p "${work_dir}/efiboot/EFI/boot"
cp "${work_dir}/x86_64/airootfs/usr/lib/systemd/boot/efi/systemd-bootx64.efi" \
"${work_dir}/efiboot/EFI/boot/bootx64.efi"
mkdir -p "${work_dir}/efiboot/loader/entries"
cp "${script_path}/efiboot/loader/loader.conf" "${work_dir}/efiboot/loader/"
sed "s|%ARCHISO_LABEL%|${iso_label}|g;
s|%INSTALL_DIR%|${install_dir}|g" \
"${script_path}/efiboot/loader/entries/archiso-x86_64-cd.conf" > \
"${work_dir}/efiboot/loader/entries/archiso-x86_64.conf"
sed "s|%ARCHISO_LABEL%|${iso_label}|g;
s|%INSTALL_DIR%|${install_dir}|g" \
"${script_path}/efiboot/loader/entries/archiso-x86_64-cd-nonfree.conf" > \
"${work_dir}/efiboot/loader/entries/archiso-x86_64-nonfree.conf"
# shellx64.efi is picked up automatically when on /
cp "${work_dir}/iso/shellx64.efi" "${work_dir}/efiboot/"
umount -d "${work_dir}/efiboot"
}
# Build airootfs filesystem image
make_prepare() {
cp -a -l -f "${work_dir}/x86_64/airootfs" "${work_dir}"
if [ -n "${verbose}" ]; then
$MKARCHISO -v -w "${work_dir}" -D "${install_dir}" pkglist
$MKARCHISO -v -w "${work_dir}" -D "${install_dir}" ${gpg_key:+-g ${gpg_key}} prepare
else
$MKARCHISO -w "${work_dir}" -D "${install_dir}" pkglist
$MKARCHISO -w "${work_dir}" -D "${install_dir}" ${gpg_key:+-g ${gpg_key}} prepare
fi
rm -rf "${work_dir}/airootfs"
# rm -rf "${work_dir}/x86_64/airootfs" (if low space, this helps)
}
# Build ISO
make_iso() {
if [ -n "${verbose}" ]; then
$MKARCHISO -v -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -P "${iso_publisher}" \
-A "${iso_application}" -o "${out_dir}" iso "${iso_name}-${iso_version}-x86_64.iso"
else
$MKARCHISO -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -P "${iso_publisher}" \
-A "${iso_application}" -o "${out_dir}" iso "${iso_name}-${iso_version}-x86_64.iso"
fi
}
if [[ ${EUID} -ne 0 ]]; then
echo "This script must be run as root."
_usage 1
fi
while getopts 'N:V:L:P:A:D:w:o:g:vh' arg; do
case "${arg}" in
N) iso_name="${OPTARG}" ;;
V) iso_version="${OPTARG}" ;;
L) iso_label="${OPTARG}" ;;
P) iso_publisher="${OPTARG}" ;;
A) iso_application="${OPTARG}" ;;
D) install_dir="${OPTARG}" ;;
w) work_dir="${OPTARG}" ;;
o) out_dir="${OPTARG}" ;;
g) gpg_key="${OPTARG}" ;;
v) verbose="-v" ;;
h) _usage 0 ;;
*)
echo "Invalid argument '${arg}'"
_usage 1
;;
esac
done
mkdir -p "${work_dir}"
run_once make_pacman_conf
run_once make_custom_airootfs
run_once make_packages
run_once make_customize_airootfs
run_once make_boot
run_once make_boot_extra
run_once make_syslinux
run_once make_isolinux
run_once make_efi
run_once make_efiboot
run_once make_prepare
run_once make_iso
ci.build.sh
+1 -1
View File
@@ -3,4 +3,4 @@
pacman --noconfirm -Syu --needed base-devel archiso mkinitcpio-archiso git squashfs-tools pacman --noconfirm -Syu --needed base-devel archiso mkinitcpio-archiso git squashfs-tools
sudo ./fix_permissions.sh sudo ./fix_permissions.sh
sudo ./build.sh -v sudo ./mkarchiso .
efiboot/loader/entries/archiso-x86_64-cd-nonfree.conf
-9
View File
@@ -1,9 +0,0 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
title CachyOS x86_64 UEFI NVIDIA (nonfree, latest cards only, no legacy) (CD)
linux /EFI/archiso/vmlinuz-linux
initrd /EFI/archiso/intel-ucode.img
initrd /EFI/archiso/amd-ucode.img
initrd /EFI/archiso/archiso.img
options archisobasedir=%INSTALL_DIR% cow_spacesize=10G archisolabel=%ARCHISO_LABEL% nvidia nouveau.modeset=0 nouveau.blacklist=yes modprobe.blacklist=nouveau i915.modeset=1 radeon.modeset=1
efiboot/loader/entries/archiso-x86_64-cd.conf
-9
View File
@@ -1,9 +0,0 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
title CachyOS x86_64 UEFI Default (CD)
linux /EFI/archiso/vmlinuz-linux
initrd /EFI/archiso/intel-ucode.img
initrd /EFI/archiso/amd-ucode.img
initrd /EFI/archiso/archiso.img
options archisobasedir=%INSTALL_DIR% cow_spacesize=10G archisolabel=%ARCHISO_LABEL% i915.modeset=1 radeon.modeset=1 nvidia.blacklist=yes modprobe.blacklist=nvidia nouveau.modeset=1 nouveau
efiboot/loader/entries/archiso-x86_64-usb-nonfree.conf → efiboot/loader/entries/archiso-x86_64-linux-nonfree.conf
+2 -2
View File
@@ -1,9 +1,9 @@
# #
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
title CachyOS x86_64 UEFI Nvidia (nonfree, latest cards only, no legacy) (USB) title CachyOS x86_64 UEFI NVIDIA (nonfree, latest cards only, no legacy) (CD)
linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux 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/archiso.img initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
options archisobasedir=%INSTALL_DIR% cow_spacesize=10G archisolabel=%ARCHISO_LABEL% nvidia nouveau.modeset=0 nouveau.blacklist=yes modprobe.blacklist=nouveau i915.modeset=1 radeon.modeset=1 options archisobasedir=%INSTALL_DIR% cow_spacesize=10G archisolabel=%ARCHISO_LABEL% nvidia nouveau.modeset=0 nouveau.blacklist=yes modprobe.blacklist=nouveau i915.modeset=1 radeon.modeset=1
efiboot/loader/entries/archiso-x86_64-usb.conf → efiboot/loader/entries/archiso-x86_64-linux.conf
+2 -2
View File
@@ -1,9 +1,9 @@
# #
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
title CachyOS x86_64 UEFI Default (USB) title CachyOS x86_64 UEFI Default
linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux 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/archiso.img initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
options archisobasedir=%INSTALL_DIR% cow_spacesize=10G archisolabel=%ARCHISO_LABEL% i915.modeset=1 radeon.modeset=1 nvidia.blacklist=yes modprobe.blacklist=nvidia nouveau.modeset=1 nouveau options archisobasedir=%INSTALL_DIR% cow_spacesize=10G archisolabel=%ARCHISO_LABEL% i915.modeset=1 radeon.modeset=1 nvidia.blacklist=yes modprobe.blacklist=nvidia nouveau.modeset=1 nouveau
efiboot/loader/loader.conf
+1 -1
View File
@@ -2,4 +2,4 @@
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
timeout 3 timeout 3
default archiso-x86_64.conf default archiso-x86_64-linux.conf
fix_permissions.sh
+1 -6
View File
@@ -2,15 +2,10 @@
# For all folders # For all folders
find ./airootfs -type d -exec chmod -R 755 {} \; find ./airootfs -type d -exec chmod -R 755 {} \;
#find ./airootfs -type d -exec chown root:root {} \;
chown root:root -R ./airootfs chown root:root -R ./airootfs
#chown root:root $(find ./airootfs |grep -v "/etc/skel")
chmod 700 ./airootfs/root chmod 700 ./airootfs/root
chmod -R 700 airootfs/etc/sudoers.d chmod -R 700 airootfs/etc/sudoers.d
chmod 444 ./airootfs/etc/sudoers.d/g_wheel chmod 444 ./airootfs/etc/sudoers.d/g_wheel
#chown root:root ./airootfs/etc/sudoers.d chmod +x ./{mkarchiso,run_before_squashfs.sh}
#chown root:root ./airootfs/etc/sudoers.d/g_wheel
chmod +x ./{build.sh,mkarchiso,run_before_squashfs.sh}
isolinux/isolinux.cfg
-9
View File
@@ -1,9 +0,0 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
PATH /%INSTALL_DIR%/boot/syslinux/
DEFAULT loadconfig
LABEL loadconfig
CONFIG /%INSTALL_DIR%/boot/syslinux/archiso.cfg
APPEND /%INSTALL_DIR%/
mirrorlist
Executable
+76
View File
@@ -0,0 +1,76 @@
##########################################
### This mirrorlist is only a fallback ###
##########################################
### Note that the mirrors were not ranked, so you may get better mirrorlist
### by ranking with e.g. program 'reflector-simple'.
## Germany & United States
Server = http://mirror.f4st.host/archlinux/$repo/os/$arch
Server = https://mirror.f4st.host/archlinux/$repo/os/$arch
Server = http://arch.mirror.constant.com/$repo/os/$arch
Server = https://arch.mirror.constant.com/$repo/os/$arch
Server = https://mirror.pseudoform.org/$repo/os/$arch
Server = http://mirror.lty.me/archlinux/$repo/os/$arch
Server = https://mirror.lty.me/archlinux/$repo/os/$arch
Server = https://mirror.pkgbuild.com/$repo/os/$arch
Server = http://iad.mirrors.misaka.one/archlinux/$repo/os/$arch
Server = https://iad.mirrors.misaka.one/archlinux/$repo/os/$arch
Server = http://archlinux.thaller.ws/$repo/os/$arch
Server = https://archlinux.thaller.ws/$repo/os/$arch
Server = https://america.mirror.pkgbuild.com/$repo/os/$arch
Server = http://mirror.wtnet.de/arch/$repo/os/$arch
Server = https://mirror.wtnet.de/arch/$repo/os/$arch
Server = http://arlm.tyzoid.com/$repo/os/$arch
Server = https://arlm.tyzoid.com/$repo/os/$arch
Server = http://phinau.de/arch/$repo/os/$arch
Server = https://phinau.de/arch/$repo/os/$arch
Server = http://arch.hu.fo/archlinux/$repo/os/$arch
Server = https://arch.hu.fo/archlinux/$repo/os/$arch
Server = http://mirror.chaoticum.net/arch/$repo/os/$arch
Server = https://mirror.chaoticum.net/arch/$repo/os/$arch
Server = http://archmirror1.octyl.net/$repo/os/$arch
Server = https://archmirror1.octyl.net/$repo/os/$arch
Server = http://arch.jensgutermuth.de/$repo/os/$arch
Server = https://arch.jensgutermuth.de/$repo/os/$arch
Server = http://mirror.hackingand.coffee/arch/$repo/os/$arch
Server = https://mirror.hackingand.coffee/arch/$repo/os/$arch
Server = http://arch.mirror.zachlge.org/$repo/os/$arch
Server = https://arch.mirror.zachlge.org/$repo/os/$arch
Server = http://mirror.arizona.edu/archlinux/$repo/os/$arch
Server = https://mirror.arizona.edu/archlinux/$repo/os/$arch
Server = http://mirror.mikrogravitation.org/archlinux/$repo/os/$arch
Server = https://mirror.mikrogravitation.org/archlinux/$repo/os/$arch
Server = http://mirrors.lug.mtu.edu/archlinux/$repo/os/$arch
Server = https://mirrors.lug.mtu.edu/archlinux/$repo/os/$arch
Server = http://ftp.halifax.rwth-aachen.de/archlinux/$repo/os/$arch
Server = https://ftp.halifax.rwth-aachen.de/archlinux/$repo/os/$arch
Server = https://mirror.bethselamin.de/$repo/os/$arch
Server = http://mirror.23m.com/archlinux/$repo/os/$arch
Server = https://mirror.23m.com/archlinux/$repo/os/$arch
Server = http://mirror.moson.org/arch/$repo/os/$arch
Server = https://mirror.moson.org/arch/$repo/os/$arch
Server = http://mirror.ubrco.de/archlinux/$repo/os/$arch
Server = https://mirror.ubrco.de/archlinux/$repo/os/$arch
Server = http://mirrors.niyawe.de/archlinux/$repo/os/$arch
Server = https://mirrors.niyawe.de/archlinux/$repo/os/$arch
mkarchiso
+869 -316
View File
File diff suppressed because it is too large. Load diff
packages.x86_64
+151 -218
View File
@@ -1,46 +1,23 @@
# #base-system
# Additions from new archiso config files
bind-tools
edk2-shell
#irssi
#kitty-terminfo
#lftp
#lynx
memtest86+
nbd
nmap
nvme-cli
rxvt-unicode-terminfo
sudo
syslinux
systemd-resolvconf
#terminus-font
#termite-terminfo
mkinitcpio-archiso
#default.groups.packages
# now packages
base base
base-devel base-devel
# kernel.cachy
# linux (base-group)
# not anymore in base-group, needs explicit install
# adding old base packages here as a list
linux linux
linux-headers linux-headers
linux-firmware linux-firmware
mkinitcpio mkinitcpio
mkinitcpio-busybox mkinitcpio-busybox
mkinitcpio-nfs-utils mkinitcpio-nfs-utils
#dkms (broadcom-wl-dkms will bring this in) cachyos-mirrorlist
cachyos-keyring
bind-tools
edk2-shell
rxvt-unicode-terminfo
sudo
systemd-resolvconf
cryptsetup cryptsetup
device-mapper device-mapper
diffutils diffutils
e2fsprogs
inetutils inetutils
jfsutils
less less
logrotate logrotate
man-db man-db
@@ -48,30 +25,22 @@ man-pages
mdadm mdadm
nano nano
perl perl
reiserfsprogs
s-nail s-nail
sysfsutils sysfsutils
systemd-sysvcompat systemd-sysvcompat
texinfo texinfo
usbutils
vi
which which
xfsprogs intel-ucode
amd-ucode
# hardware-support.packages #ISO-specific
lsscsi mkinitcpio-archiso
sdparm syslinux
sg3_utils memtest86+
smartmontools xcompmgr
arch-install-scripts
# EFI/UEFI.packages #x-system
refind
# keyring_mirros.cachyos
cachyos-keyring
cachyos-mirrorlist
# xorg.cachyos
xf86-video-vesa xf86-video-vesa
xorg-server xorg-server
xorg-xinit xorg-xinit
@@ -84,110 +53,46 @@ xf86-video-amdgpu
xf86-video-ati xf86-video-ati
xf86-video-fbdev xf86-video-fbdev
xf86-video-intel xf86-video-intel
#xf86-video-nouveau
nvidia-dkms nvidia-dkms
nvidia-utils nvidia-utils
#removed as it is not needed to run nvidia driver
#nvidia-settings
# loginmanager.packages #filesystem
lightdm-gtk-greeter
lightdm-gtk-greeter-settings
# now needed for lightdm in some cases
accountsservice
# default.desktop.cachyos
plasma-browser-integration
plasma-desktop
plasma-firewall
plasma-framework
plasma-integration
plasma-nm
plasma-pa
plasma-systemmonitor
plasma-thunderbolt
plasma-workspace
# goodies selection
# mousepad (issues with sudo)
xed
parole
ristretto
dolphin
dolphin-plugins
konsole
neofetch
# theme.plasma.cachyos
capitaine-cursors
gtk-engine-murrine
gnome-themes-extra
adwaita-icon-theme
cachyos-grub-theme
# extra.desktop.packages
dconf-editor
file-roller
libwnck3
network-manager-applet
transmission-gtk
gnome-calculator
# default.browser.cachyos
cachy-browser
# fonts
ttf-dejavu
ttf-liberation
ttf-bitstream-vera
#ttf-ubuntu-font-family
cantarell-fonts
#ttf-croscore
#ttf-carlito
#ttf-caladea
noto-fonts
adobe-source-han-sans-jp-fonts
adobe-source-han-sans-kr-fonts
adobe-source-han-sans-cn-fonts
opendesktop-fonts
ttf-opensans
# filesystems.packages
btrfs-progs btrfs-progs
dosfstools dosfstools
f2fs-tools f2fs-tools
xfsprogs
e2fsprogs
lvm2 lvm2
mtools mtools
ntfs-3g ntfs-3g
exfat-utils reiserfsprogs
jfsutils
nvme-cli
exfatprogs
nfs-utils nfs-utils
nilfs-utils nilfs-utils
mlocate
gvfs gvfs
gvfs-afc gvfs-afc
gvfs-goa
gvfs-gphoto2 gvfs-gphoto2
gvfs-mtp gvfs-mtp
gvfs-nfs gvfs-nfs
gvfs-smb gvfs-smb
# installation.packages # zfs support
arch-install-scripts zfs-dkms
pacman-contrib zfs-utils
#general-system
mlocate
crda crda
dialog dialog
dmraid dmraid
efibootmgr
efitools
fakeroot fakeroot
gptfdisk gptfdisk
grub
haveged haveged
hwdetect hwdetect
hwinfo hwinfo
ntp ntp
os-prober
# system.packages
expect expect
git git
pkgfile pkgfile
@@ -199,19 +104,104 @@ wget
xdg-user-dirs-gtk xdg-user-dirs-gtk
xz xz
gpm gpm
intel-ucode poppler-glib
amd-ucode libgsf
libopenraw
freetype2
gpart
gspell
pacman-contrib
rebuild-detector
# for ssh #general-hardware
gnome-keyring lsscsi
sdparm
sg3_utils
smartmontools
usbutils
# network.packages #DM
#b43-firmware lightdm-gtk-greeter
lightdm-gtk-greeter-settings
accountsservice
#plasma-desktop
plasma-browser-integration
plasma-desktop
plasma-firewall
plasma-framework
plasma-integration
plasma-nm
plasma-pa
plasma-systemmonitor
plasma-thunderbolt
plasma-workspace
xed
parole
ristretto
dolphin
dolphin-plugins
konsole
neofetch
capitaine-cursors
gtk-engine-murrine
gnome-themes-extra
adwaita-icon-theme
file-roller
libwnck3
network-manager-applet
galculator
cachy-browser
kvantum-qt5
qt5ct
#fonts
ttf-dejavu
ttf-liberation
ttf-bitstream-vera
cantarell-fonts
noto-fonts
adobe-source-han-sans-jp-fonts
adobe-source-han-sans-kr-fonts
adobe-source-han-sans-cn-fonts
opendesktop-fonts
ttf-opensans
#audio
alsa-utils
alsa-plugins
alsa-firmware
sof-firmware
pulseaudio-alsa
pulseaudio-bluetooth
pulseaudio-equalizer
pulseaudio-jack
pavucontrol
ffmpegthumbnailer
gst-libav
gst-plugins-bad
gst-plugins-ugly
gst-plugin-pipewire
#boot
grub
efibootmgr
efitools
os-prober
refind
#net-hardware
b43-fwcutter b43-fwcutter
broadcom-wl-dkms broadcom-wl-dkms
dnsutils dnsutils
ipw2100-fw ipw2100-fw
ipw2200-fw ipw2200-fw
linux-atm
r8168
#network
nbd
nmap
modemmanager modemmanager
netctl netctl
net-tools net-tools
@@ -226,7 +216,6 @@ dnsmasq
elinks elinks
ethtool ethtool
openconnect openconnect
openssh
openvpn openvpn
rp-pppoe rp-pppoe
wireless-regdb wireless-regdb
@@ -234,21 +223,27 @@ wpa_supplicant
wvdial wvdial
gnu-netcat gnu-netcat
iwd iwd
linux-atm
ndisc6 ndisc6
ppp ppp
pptpclient pptpclient
vpnc vpnc
xl2tpd xl2tpd
r8168
# calamares.cachy #live-iso-tools
calamares gparted
calamares-branding-cachyos grsync
#calamares_current clonezilla
#calamares_test hdparm
fsarchiver
glances
python-defusedxml
inxi
bash-completion
downgrade
pcurses
tldr
# calamares.dependencies #calamares
lsb-release lsb-release
libpwquality libpwquality
cmake cmake
@@ -256,17 +251,8 @@ qt5-svg
qt5-webengine qt5-webengine
yaml-cpp yaml-cpp
extra-cmake-modules extra-cmake-modules
boost boost-libs
# calamares.modules
# dependencies for installer modules
#for encrypted swap
#for showing keyboard layouts
# calamares.welcome
upower upower
# calamares.partition
kcoreaddons kcoreaddons
kconfig kconfig
ki18n ki18n
@@ -274,12 +260,7 @@ kservice
kwidgetsaddons kwidgetsaddons
kpmcore kpmcore
parted parted
gparted
# calamares.unpackfs
squashfs-tools squashfs-tools
# calamares.others
qt5-xmlpatterns qt5-xmlpatterns
doxygen doxygen
tcpdump tcpdump
@@ -289,73 +270,25 @@ polkit-qt5
python python
solid solid
qt5-tools qt5-tools
#pythonqt calamares
calamares-branding-cachyos
# liveiso.rescue-tools #cachyos-repo
grsync #rate-mirrors-bin
#ddrescue mkinitcpio-openswap
#dd_rescue ckbcomp
#testdisk cachyos-grub-theme
clonezilla #cachyos-theming
#partclone
#partimage
gftp
hdparm
fsarchiver
#mc
# sound
alsa-utils
alsa-plugins
alsa-firmware
pulseaudio-alsa
pulseaudio-bluetooth
pulseaudio-equalizer
pulseaudio-jack
# developers.wishes
#htop
glances
#rsync (grsync will bring this in)
hardinfo
bash-completion
pcurses
tldr
# needed.dependencies
pavucontrol
ffmpegthumbnailer
poppler-glib
libgsf
libopenraw
freetype2
gst-libav
gst-plugins-bad
gst-plugins-ugly
gst-plugin-pipewire
gpart
libdvdcss
# AUR-support
paru paru
yad
#welcome
meld
#keyserver-rank-cachy
reflector-simple
#virtualbox.packages #vm-support
qemu-guest-agent
virtualbox-guest-utils virtualbox-guest-utils
#Vmware.packages
open-vm-tools open-vm-tools
xf86-input-vmmouse xf86-input-vmmouse
xf86-video-vmware xf86-video-vmware
#screen tearing at ISO
xcompmgr
# cachyos.welcome
yad
gspell
#welcome
meld
# zfs support
zfs-dkms
zfs-utils
pacman.conf
+8 -2
View File
@@ -33,11 +33,13 @@ Architecture = auto
# Misc options # Misc options
#UseSyslog #UseSyslog
Color Color
ILoveCandy
#TotalDownload #TotalDownload
# We cannot check disk space from within a chroot environment # We cannot check disk space from within a chroot environment
#CheckSpace #CheckSpace
#VerbosePkgLists VerbosePkgLists
ParallelDownloads = 5 DisableDownloadTimeout
ParallelDownloads = 10
# By default, pacman accepts packages signed by keys that its local keyring # By default, pacman accepts packages signed by keys that its local keyring
# trusts (see pacman-key and its man page), as well as unsigned packages. # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -106,6 +108,10 @@ Include = /etc/pacman.d/mirrorlist
[multilib] [multilib]
Include = /etc/pacman.d/mirrorlist Include = /etc/pacman.d/mirrorlist
[chaotic-aur]
SigLevel = Optional TrustAll
Server = https://geo-mirror.chaotic.cx/$repo/$arch
# An example of a custom package repository. See the pacman manpage for # An example of a custom package repository. See the pacman manpage for
# tips on creating your own repositories. # tips on creating your own repositories.
#[custom] #[custom]
profiledef.sh
+22
View File
@@ -0,0 +1,22 @@
#!/usr/bin/env bash
# shellcheck disable=SC2034
iso_name="cachyos"
iso_label="CachyOS_$(date +%Y%m)"
iso_publisher="CachyOS <https://cachyos.org>"
iso_application="CachyOS Live/Rescue CD"
iso_version="$(date +%Y.%m.%d)"
install_dir="arch"
work_dir=work
out_dir=out
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')
file_permissions=(
["/etc/shadow"]="0:0:0400"
["/etc/gshadow"]="0:0:0400"
["/root"]="0:0:750"
["/root/.automated_script.sh"]="0:0:755"
["/etc/sudoers.d"]="0:0:750"
)
run_before_squashfs.sh
+34 -23
View File
@@ -2,13 +2,14 @@
# Made by Fernando "maroto" # Made by Fernando "maroto"
# Run anything in the filesystem right before being "mksquashed" # Run anything in the filesystem right before being "mksquashed"
# ISO-NEXT specific cleanup removals and additions (08-2021) @killajoe and @manuel
script_path=$(readlink -f ${0%/*}) script_path=$(readlink -f ${0%/*})
work_dir=work work_dir=work
# Adapted from AIS. An excellent bit of code! # Adapted from AIS. An excellent bit of code!
arch_chroot(){ arch_chroot(){
arch-chroot $script_path/${work_dir}/airootfs /bin/bash -c "${1}" arch-chroot $script_path/${work_dir}/x86_64/airootfs /bin/bash -c "${1}"
} }
do_merge(){ do_merge(){
@@ -20,20 +21,27 @@ locale-gen
ln -sf /usr/share/zoneinfo/UTC /etc/localtime ln -sf /usr/share/zoneinfo/UTC /etc/localtime
usermod -s /usr/bin/bash root usermod -s /usr/bin/bash root
cp -aT /etc/skel/ /root/ cp -aT /etc/skel/ /root/
rm /root/xed.dconf
chmod 700 /root chmod 700 /root
useradd -m -p \"\" -g users -G 'sys,rfkill,wheel' -s /bin/bash liveuser useradd -m -p \"\" -g users -G 'sys,rfkill,wheel' -s /bin/bash liveuser
git clone https://github.com/endeavouros-team/liveuser-desktop-settings.git git clone -b 08-2021 --single-branch https://github.com/endeavouros-team/liveuser-desktop-settings.git
#git clone https://github.com/endeavouros-team/liveuser-desktop-settings.git
cd liveuser-desktop-settings cd liveuser-desktop-settings
rm -R /home/liveuser/.config rm -R /home/liveuser/.config
cp -R .config /home/liveuser/ cp -R .config /home/liveuser/
chown -R liveuser:users /home/liveuser/.config chown -R liveuser:liveuser /home/liveuser/.config
cp .xinitrc .xprofile .Xauthority /home/liveuser/
chown liveuser:liveuser /home/liveuser/.xinitrc
chown liveuser:liveuser /home/liveuser/.xprofile
chown liveuser:liveuser /home/liveuser/.Xauthority
cp -R .local /home/liveuser/
chown -R liveuser:liveuser /home/liveuser/.local
chmod +x /home/liveuser/.local/bin/*
cp user_pkglist.txt /home/liveuser/ cp user_pkglist.txt /home/liveuser/
chown liveuser:users /home/liveuser/user_pkglist.txt chown liveuser:liveuser /home/liveuser/user_pkglist.txt
rm /home/liveuser/.bashrc rm /home/liveuser/.bashrc
cp .bashrc /home/liveuser/ cp .bashrc /home/liveuser/
chown liveuser:users /home/liveuser/.bashrc chown liveuser:liveuser /home/liveuser/.bashrc
cp -R community_editions /home/liveuser/
chown -R liveuser:users /home/liveuser/community_editions
cp LICENSE /home/liveuser/ cp LICENSE /home/liveuser/
cd .. cd ..
rm -R liveuser-desktop-settings rm -R liveuser-desktop-settings
@@ -47,7 +55,7 @@ chown root:root /etc/sudoers.d
chown root:root /etc/sudoers.d/g_wheel chown root:root /etc/sudoers.d/g_wheel
chmod 755 /etc chmod 755 /etc
sed -i 's/#\(PermitRootLogin \).\+/\1yes/' /etc/ssh/sshd_config sed -i 's/#\(PermitRootLogin \).\+/\1yes/' /etc/ssh/sshd_config
sed -i 's/#Server/Server/g' /etc/pacman.d/mirrorlist # sed -i 's/#Server/Server/g' /etc/pacman.d/mirrorlist
sed -i 's/#\(Storage=\)auto/\1volatile/' /etc/systemd/journald.conf sed -i 's/#\(Storage=\)auto/\1volatile/' /etc/systemd/journald.conf
sed -i 's/#\(HandleSuspendKey=\)suspend/\1ignore/' /etc/systemd/logind.conf sed -i 's/#\(HandleSuspendKey=\)suspend/\1ignore/' /etc/systemd/logind.conf
sed -i 's/#\(HandleHibernateKey=\)hibernate/\1ignore/' /etc/systemd/logind.conf sed -i 's/#\(HandleHibernateKey=\)hibernate/\1ignore/' /etc/systemd/logind.conf
@@ -58,26 +66,29 @@ systemctl set-default multi-user.target
cp -rf /usr/share/mkinitcpio/hook.preset /etc/mkinitcpio.d/linux.preset cp -rf /usr/share/mkinitcpio/hook.preset /etc/mkinitcpio.d/linux.preset
sed -i 's?%PKGBASE%?linux?' /etc/mkinitcpio.d/linux.preset sed -i 's?%PKGBASE%?linux?' /etc/mkinitcpio.d/linux.preset
pacman-key --init # fetch fallback mirrorlist for offline installs:
pacman-key --add /usr/share/pacman/keyrings/cachyos.gpg && sudo pacman-key --lsign-key F3B607488DB35A47 wget https://gitlab.com/cachyos/cachyos-archiso/-/raw/master/mirrorlist
pacman-key --populate cp mirrorlist /etc/pacman.d/
pacman-key --refresh-keys rm mirrorlist
pacman -Syy
# now done with recreating pacman keyring inside calamares:
# shellprocess_initialize_pacman
#pacman-key --init
#pacman-key --add /usr/share/pacman/keyrings/cachyos.gpg && sudo pacman-key --lsign-key F3B607488DB35A47
#pacman-key --populate
#pacman-key --refresh-keys
#pacman -Syy
# now done with recreating pacman keyring inside calamares:
# shellprocess_initialize_pacman
#rm -R /etc/pacman.d/gnupg
sed -i 's|^GRUB_CMDLINE_LINUX_DEFAULT=\"\(.*\)\"$|GRUB_CMDLINE_LINUX_DEFAULT=\"\1 nowatchdog\"|' /etc/default/grub sed -i 's|^GRUB_CMDLINE_LINUX_DEFAULT=\"\(.*\)\"$|GRUB_CMDLINE_LINUX_DEFAULT=\"\1 nowatchdog\"|' /etc/default/grub
sed -i 's?GRUB_DISTRIBUTOR=.*?GRUB_DISTRIBUTOR=\"CachyOS\"?' /etc/default/grub sed -i 's?GRUB_DISTRIBUTOR=.*?GRUB_DISTRIBUTOR=\"CachyOS\"?' /etc/default/grub
sed -i 's?\#GRUB_THEME=.*?GRUB_THEME=\/boot\/grub\/themes\/CachyOS\/theme.txt?g' /etc/default/grub sed -i 's?\#GRUB_THEME=.*?GRUB_THEME=\/boot\/grub\/themes\/CachyOS\/theme.txt?g' /etc/default/grub
echo 'GRUB_DISABLE_SUBMENU=y' >> /etc/default/grub echo 'GRUB_DISABLE_SUBMENU=y' >> /etc/default/grub
rm /boot/grub/grub.cfg rm /boot/grub/grub.cfg
wget https://gitlab.com/cachyos/install-scripts/-/raw/master/cleaner_script.sh wget https://raw.githubusercontent.com/endeavouros-team/liveuser-desktop-settings/08-2021/dconf/xed.dconf
wget https://gitlab.com/cachyos/install-scripts/-/raw/master/chrooted_cleaner_script.sh
wget https://gitlab.com/cachyos/install-scripts/-/raw/master/calamares_switcher
wget https://gitlab.com/cachyos/install-scripts/-/raw/master/pacstrap_calamares
wget https://gitlab.com/cachyos/install-scripts/-/raw/master/update-mirrorlist
wget https://gitlab.com/cachyos/install-scripts/-/raw/master/calamares_for_testers
wget https://gitlab.com/cachyos/install-scripts/-/raw/master/prepare-calamares
chmod +x cleaner_script.sh chrooted_cleaner_script.sh calamares_switcher pacstrap_calamares update-mirrorlist calamares_for_testers prepare-calamares
mv cleaner_script.sh chrooted_cleaner_script.sh calamares_switcher update-mirrorlist pacstrap_calamares calamares_for_testers prepare-calamares /usr/bin/
wget https://raw.githubusercontent.com/endeavouros-team/liveuser-desktop-settings/master/dconf/xed.dconf
dbus-launch dconf load / < xed.dconf dbus-launch dconf load / < xed.dconf
sudo -H -u liveuser bash -c 'dbus-launch dconf load / < xed.dconf' sudo -H -u liveuser bash -c 'dbus-launch dconf load / < xed.dconf'
rm xed.dconf rm xed.dconf
syslinux/archiso_head.cfg
+4 -3
View File
@@ -2,9 +2,9 @@
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
SERIAL 0 38400 SERIAL 0 38400
UI boot/syslinux/vesamenu.c32 UI vesamenu.c32
MENU TITLE CachyOS MENU TITLE Arch Linux
MENU BACKGROUND boot/syslinux/splash.png MENU BACKGROUND splash.png
MENU WIDTH 78 MENU WIDTH 78
MENU MARGIN 4 MENU MARGIN 4
@@ -28,3 +28,4 @@ MENU COLOR msg07 37;40 #90ffffff #a0000000 std
MENU COLOR tabmsg 31;40 #30ffffff #00000000 std MENU COLOR tabmsg 31;40 #30ffffff #00000000 std
MENU CLEAR MENU CLEAR
MENU IMMEDIATE
syslinux/archiso_pxe-linux.cfg
+35
View File
@@ -0,0 +1,35 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
LABEL cachyos_nbd
TEXT HELP
Boot the CachyOS install medium using NBD.
It allows you to install CachyOS or perform system maintenance.
ENDTEXT
MENU LABEL CachyOS install medium (x86_64, NBD)
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
APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver} checksum verify
SYSAPPEND 3
LABEL cachyos_nfs
TEXT HELP
Boot the CachyOS live medium using NFS.
It allows you to install CachyOS or perform system maintenance.
ENDTEXT
MENU LABEL CachyOS install medium (x86_64, NFS)
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
APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt checksum verify
SYSAPPEND 3
LABEL cachyos_http
TEXT HELP
Boot the CachyOS live medium using HTTP.
It allows you to install CachyOS or perform system maintenance.
ENDTEXT
MENU LABEL CachyOS install medium (x86_64, HTTP)
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
APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ checksum verify
SYSAPPEND 3
syslinux/archiso_pxe.cfg
+3 -34
View File
@@ -1,39 +1,8 @@
# #
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
INCLUDE boot/syslinux/archiso_head.cfg INCLUDE archiso_head.cfg
LABEL arch64_nbd INCLUDE archiso_pxe-linux.cfg
TEXT HELP
MENU LABEL Boot CachyOS (x86_64) (NBD)
It allows you to install CachyOS or perform system maintenance.
ENDTEXT
MENU LABEL CachyOS install medium (x86_64, NBD)
LINUX boot/x86_64/vmlinuz-linux
INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/archiso.img
APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver}
SYSAPPEND 3
LABEL arch64_nfs INCLUDE archiso_tail.cfg
TEXT HELP
Boot the CachyOS live medium using NFS.
It allows you to install CachyOS or perform system maintenance.
ENDTEXT
MENU LABEL CachyOS install medium (x86_64, NFS)
LINUX boot/x86_64/vmlinuz-linux
INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/archiso.img
APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt
SYSAPPEND 3
LABEL arch64_http
TEXT HELP
Boot the CachyOS live medium using HTTP.
It allows you to install CachyOS or perform system maintenance.
ENDTEXT
MENU LABEL CachyOS install medium (x86_64, HTTP)
LINUX boot/x86_64/vmlinuz-linux
INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/archiso.img
APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/
SYSAPPEND 3
INCLUDE boot/syslinux/archiso_tail.cfg
syslinux/archiso_sys-linux.cfg
+23
View File
@@ -0,0 +1,23 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
LABEL cachyos
TEXT HELP
Boot the CachyOS install medium on BIOS.
It allows you to install CachyOS or perform system maintenance.
ENDTEXT
MENU LABEL CachyOS install default (x86_64, BIOS)
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
APPEND archisobasedir=%INSTALL_DIR% cow_spacesize=10G archisolabel=%ARCHISO_LABEL% nouveau.modeset=1 nouveau i915.modeset=1 radeon.modeset=1 modprobe.blacklist=nvidia
# Nvidia propritary (Non-Free)
LABEL cachyos-nvidia
TEXT HELP
Boot the CachyOS install medium on BIOS NVIDIA-NONFREE LATEST-CARDS NO-LEGACY.
It allows you to install CachyOS or perform system maintenance.
ENDTEXT
MENU LABEL CachyOS NVIDIA-NONFREE LATEST-CARDS NO-LEGACY (x86_64)
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
APPEND archisobasedir=%INSTALL_DIR% cow_spacesize=10G archisolabel=%ARCHISO_LABEL% nouveau.modeset=0 modprobe.blacklist=nouveau nvidia i915.modeset=1 radeon.modeset=1
syslinux/archiso_sys.cfg
+5 -15
View File
@@ -1,21 +1,11 @@
# #
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
INCLUDE boot/syslinux/archiso_head.cfg INCLUDE archiso_head.cfg
LABEL arch64 DEFAULT cachyos
TEXT HELP TIMEOUT 150
Boot the CachyOS Linux (x86_64) live medium.
It allows you to install CachyOS or perform system maintenance.
ENDTEXT
MENU LABEL Boot CachyOS Default (x86_64)
LINUX boot/x86_64/vmlinuz-linux
INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/archiso.img
APPEND archisobasedir=%INSTALL_DIR% cow_spacesize=10G archisolabel=%ARCHISO_LABEL% nouveau.modeset=1 nouveau i915.modeset=1 radeon.modeset=1 modprobe.blacklist=nvidia
LABEL Boot CachyOS NVIDIA-NONFREE LATEST-CARDS NO-LEGACY (x86_64) INCLUDE archiso_sys-linux.cfg
LINUX boot/x86_64/vmlinuz-linux
INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/archiso.img
APPEND archisobasedir=%INSTALL_DIR% cow_spacesize=10G archisolabel=%ARCHISO_LABEL% nouveau.modeset=0 modprobe.blacklist=nouveau nvidia i915.modeset=1 radeon.modeset=1
INCLUDE boot/syslinux/archiso_tail.cfg INCLUDE archiso_tail.cfg
syslinux/archiso_tail.cfg
+6 -6
View File
@@ -7,19 +7,19 @@ Boot an existing operating system.
Press TAB to edit the disk and partition number to boot. Press TAB to edit the disk and partition number to boot.
ENDTEXT ENDTEXT
MENU LABEL Boot existing OS MENU LABEL Boot existing OS
COM32 boot/syslinux/chain.c32 COM32 chain.c32
APPEND hd0 0 APPEND hd0 0
# http://www.memtest.org/ # http://www.memtest.org/
LABEL memtest LABEL memtest
MENU LABEL Run Memtest86+ (RAM test) MENU LABEL Run Memtest86+ (RAM test)
LINUX boot/memtest LINUX /%INSTALL_DIR%/boot/memtest
# http://hdt-project.org/ # http://hdt-project.org/
LABEL hdt LABEL hdt
MENU LABEL Hardware Information (HDT) MENU LABEL Hardware Information (HDT)
COM32 boot/syslinux/hdt.c32 COM32 hdt.c32
APPEND modules_alias=boot/syslinux/hdt/modalias.gz pciids=boot/syslinux/hdt/pciids.gz APPEND modules_alias=hdt/modalias.gz pciids=hdt/pciids.gz
LABEL reboot LABEL reboot
TEXT HELP TEXT HELP
@@ -27,7 +27,7 @@ Reboot computer.
The computer's firmware must support APM. The computer's firmware must support APM.
ENDTEXT ENDTEXT
MENU LABEL Reboot MENU LABEL Reboot
COM32 boot/syslinux/reboot.c32 COM32 reboot.c32
LABEL poweroff LABEL poweroff
TEXT HELP TEXT HELP
@@ -35,4 +35,4 @@ Power off computer.
The computer's firmware must support APM. The computer's firmware must support APM.
ENDTEXT ENDTEXT
MENU LABEL Power Off MENU LABEL Power Off
COM32 boot/syslinux/poweroff.c32 COM32 poweroff.c32
syslinux/syslinux.cfg
+13 -4
View File
@@ -1,5 +1,14 @@
DEFAULT loadconfig #
# SPDX-License-Identifier: GPL-3.0-or-later
LABEL loadconfig DEFAULT select
CONFIG archiso.cfg
APPEND ../../ LABEL select
COM32 whichsys.c32
APPEND -pxe- pxe -sys- sys -iso- sys
LABEL pxe
CONFIG archiso_pxe.cfg
LABEL sys
CONFIG archiso_sys.cfg