Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use the refactored frzr #66

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Use the refactored frzr #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
00b2109
Use the refactored frzr
NeroReflex Dec 4, 2024
c4742d8
Change hostname to include installer
NeroReflex Dec 5, 2024
4e9a46b
Change locale
NeroReflex Dec 5, 2024
e2b93aa
Compress the initramfs as much as possible
NeroReflex Dec 5, 2024
68c838c
Copy the image to RAM
NeroReflex Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions build-iso.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,19 @@ mkdir -p "${temp_dir}"

# add AUR packages to the build
AUR_PACKAGES="\
frzr-git \
rtl88x2bu-dkms-git \
rtw89-dkms-git \
r8152-dkms \
rtl8812au-dkms-git \
rtl8814au-dkms-git \
rtl8821au-dkms-git \
rz608-fix-git \
inputplumber-bin \
rz608-fix-git
"

ADDITIONAL_PACKAGES="\
https://github.com/ChimeraOS/linux-chimeraos/releases/download/v6.10.3-chos1-1/linux-chimeraos-6.10.3.chos1-1-x86_64.pkg.tar.zst \
https://github.com/ChimeraOS/linux-chimeraos/releases/download/v6.10.3-chos1-1/linux-chimeraos-headers-6.10.3.chos1-1-x86_64.pkg.tar.zst \
https://github.com/ChimeraOS/linux-chimeraos/releases/download/v6.12.1-chos1-2/linux-chimeraos-6.12.1.chos1-2-x86_64.pkg.tar.zst \
https://github.com/ChimeraOS/linux-chimeraos/releases/download/v6.12.1-chos1-2/linux-chimeraos-headers-6.12.1.chos1-2-x86_64.pkg.tar.zst \
"

# create repo directory if it doesn't exist yet
Expand All @@ -47,6 +47,8 @@ if [ -n "${BUILD_USER}" ]; then
PIKAUR_RUN=(su "${BUILD_USER}" -c "${PIKAUR_CMD}")
fi

pacman --noconfirm -S --overwrite '*' --disable-download-timeout ${PACKAGES}

# build packages to the repo
pushd /home/${BUILD_USER}
"${PIKAUR_RUN[@]}"
Expand Down
2 changes: 1 addition & 1 deletion chimeraos/airootfs/etc/hostname
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
chimeraos
chimeraos-installer
5 changes: 1 addition & 4 deletions chimeraos/airootfs/etc/locale.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later

LANG=en_US.UTF-8
LANG=C.UTF-8
1 change: 1 addition & 0 deletions chimeraos/airootfs/etc/mkinitcpio.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,4 @@ COMPRESSION="xz"
# COMPRESSION_OPTIONS
# Additional options for the compressor
#COMPRESSION_OPTIONS=()
COMPRESSION_OPTIONS=(-T0 -9e --memlimit=7000MiB)
14 changes: 11 additions & 3 deletions chimeraos/airootfs/root/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,17 @@ Do you wish to proceed?" 15 70); then
cancel_install
fi

export SHOW_UI=1
export FRZR_INSTALLER=1
export MOUNT_PATH="/tmp/frzr_root"
export EFI_MOUNT_PATH="/tmp/frzr_root/efi"
export SWAP_GIB=0
export SYSTEMD_RELAX_ESP_CHECKS=1

# perform bootstrap of disk
if ! frzr-bootstrap gamer /dev/${DISK}; then
frzr bootstrap gamer /dev/${DISK}
RESULT=$?
if [ "${RESULT}" != "0" ]; then
whiptail --msgbox "System bootstrap step failed." 10 50
cancel_install
fi
Expand All @@ -252,8 +261,7 @@ if [ -d ${SYS_CONN_DIR} ] && [ -n "$(ls -A ${SYS_CONN_DIR})" ]; then
${MOUNT_PATH}${SYS_CONN_DIR}/.
fi

export SHOW_UI=1
frzr-deploy chimeraos/chimeraos:${TARGET}
frzr deploy chimeraos/chimeraos:${TARGET}
RESULT=$?

MSG="Installation failed."
Expand Down
Loading