root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 12:00:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix local image with 2700 RAM

Browse source
This commit is contained in:
Tobias Powalowski 2023-02-20 10:46:04 +01:00
parent f4e41b28f3
commit 0cbe7063eb
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
usr/lib/archboot/login.sh
View file

@ -35,6 +35,7 @@ if [[ "${TTY}" = "tty1" ]]; then
[[ -d /sysroot ]] || mkdir /sysroot [[ -d /sysroot ]] || mkdir /sysroot
modprobe zram &>/dev/null modprobe zram &>/dev/null
modprobe zstd &>/dev/null modprobe zstd &>/dev/null
echo "1" >/sys/block/zram0/reset
echo "zstd" >/sys/block/zram0/comp_algorithm echo "zstd" >/sys/block/zram0/comp_algorithm
echo "4G" >/sys/block/zram0/disksize echo "4G" >/sys/block/zram0/disksize
echo -e "\e[1mStep 2/3:\e[m Creating btrfs on /dev/zram0..." echo -e "\e[1mStep 2/3:\e[m Creating btrfs on /dev/zram0..."

14
usr/lib/archboot/update-installer/update-installer.sh
View file

@ -332,12 +332,12 @@ _new_environment() {
_kill_w_dir _kill_w_dir
# local switch, don't kexec on local image # local switch, don't kexec on local image
if [[ -e /var/cache/pacman/pkg/archboot.db ]]; then if [[ -e /var/cache/pacman/pkg/archboot.db ]]; then
echo -e "\e[1mStep 01/07:\e[m Waiting for gpg pacman keyring import to finish..." echo -e "\e[1mStep 1/6:\e[m Waiting for gpg pacman keyring import to finish..."
_gpg_check _gpg_check
echo -e "\e[1mStep 02/07:\e[m Removing not necessary files from /..." echo -e "\e[1mStep 2/6:\e[m Removing not necessary files from /..."
_clean_archboot _clean_archboot
_clean_kernel_cache _clean_kernel_cache
echo -e "\e[1mStep 03/07:\e[m Generating archboot container in ${_W_DIR}..." echo -e "\e[1mStep 3/6:\e[m Generating archboot container in ${_W_DIR}..."
echo " This will need some time..." echo " This will need some time..."
_create_container || exit 1 _create_container || exit 1
_clean_kernel_cache _clean_kernel_cache
@ -348,16 +348,16 @@ _new_environment() {
[[ ${_RUNNING_ARCH} == "aarch64" || ${_RUNNING_ARCH} == "riscv64" ]] && _kver_generic [[ ${_RUNNING_ARCH} == "aarch64" || ${_RUNNING_ARCH} == "riscv64" ]] && _kver_generic
# fallback if no detectable kernel is installed # fallback if no detectable kernel is installed
[[ -z "${_HWKVER}" ]] && _HWKVER="$(uname -r)" [[ -z "${_HWKVER}" ]] && _HWKVER="$(uname -r)"
echo -e "\e[1mStep 05/07:\e[m Collecting rootfs files in ${_W_DIR}..." echo -e "\e[1mStep 4/6:\e[m Collecting rootfs files in ${_W_DIR}..."
echo " This will need some time..." echo " This will need some time..."
# write initramfs to "${_W_DIR}"/tmp # write initramfs to "${_W_DIR}"/tmp
${_NSPAWN} "${_W_DIR}" /bin/bash -c "umount tmp;mkinitcpio -k ${_HWKVER} -c ${_CONFIG} -d /tmp" >/dev/tty7 2>&1 || exit 1 ${_NSPAWN} "${_W_DIR}" /bin/bash -c "umount tmp;mkinitcpio -k ${_HWKVER} -c ${_CONFIG} -d /tmp" >/dev/tty7 2>&1 || exit 1
echo -e "\e[1mStep 06/07:\e[m Cleanup ${_W_DIR}..." echo -e "\e[1mStep 5/6:\e[m Cleanup ${_W_DIR}..."
find "${_W_DIR}"/. -mindepth 1 -maxdepth 1 ! -name 'tmp' -exec rm -rf {} \; find "${_W_DIR}"/. -mindepth 1 -maxdepth 1 ! -name 'tmp' -exec rm -rf {} \;
_clean_kernel_cache _clean_kernel_cache
_ram_check _ram_check
echo -e "\e[1mStep 07/07:\e[m Switch root to ${_RAM}..." echo -e "\e[1mStep 6/6:\e[m Switch root to ${_RAM}..."
mv ${_W_DIR}/tmp/* /ramfs/ mv ${_W_DIR}/tmp/* /${_RAM}/
# cleanup mkinitcpio directories and files # cleanup mkinitcpio directories and files
rm -rf /sysroot/{hooks,install,kernel,new_root,sysroot} &>/dev/null rm -rf /sysroot/{hooks,install,kernel,new_root,sysroot} &>/dev/null
rm -f /sysroot/{VERSION,config,buildconfig,init} &>/dev/null rm -f /sysroot/{VERSION,config,buildconfig,init} &>/dev/null