mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-19 19:40:37 +02:00
simplify init
This commit is contained in:
parent
fc607250e8
commit
1feb925b78
2 changed files with 18 additions and 13 deletions
|
@ -1,6 +1,6 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
# archboot--detect-vconsole.sh:
|
# archboot-detect-vconsole.sh:
|
||||||
# sets bigger font on bigger display resolutions
|
# sets bigger font on bigger display resolutions
|
||||||
# by Tobias Powalowski <tpowa@archlinux.org>
|
# by Tobias Powalowski <tpowa@archlinux.org>
|
||||||
#
|
#
|
||||||
|
|
|
@ -60,6 +60,19 @@ _task() {
|
||||||
_COUNT=$((_COUNT+1))
|
_COUNT=$((_COUNT+1))
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
if [[ "${1}" == check ]]; then
|
||||||
|
if ! [[ -f "/mnt/efi/boot/initrd-${_ARCH}.img" ]] ; then
|
||||||
|
if ! mount /mnt/cdrom/efi.img /mnt/efi &>/dev/null; then
|
||||||
|
_clear
|
||||||
|
_wrn "Archboot Emergeny Shell:"
|
||||||
|
_wrn "Error: Didn't find a device with archboot rootfs!"
|
||||||
|
_msg "This needs further debugging. Please contact the archboot author."
|
||||||
|
_msg "Tobias Powalowski: tpowa@archlinux.org"
|
||||||
|
echo ""
|
||||||
|
systemctl start emergency.service
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
if [[ "${1}" == btrfs ]]; then
|
if [[ "${1}" == btrfs ]]; then
|
||||||
echo "zstd" >/sys/block/zram0/comp_algorithm
|
echo "zstd" >/sys/block/zram0/comp_algorithm
|
||||||
echo "5G" >/sys/block/zram0/disksize
|
echo "5G" >/sys/block/zram0/disksize
|
||||||
|
@ -94,20 +107,12 @@ _initrd_stage() {
|
||||||
: >/.archboot
|
: >/.archboot
|
||||||
_task mount &
|
_task mount &
|
||||||
_progress_wait "0" "10" "${_KEEP} Searching for rootfs..." "1"
|
_progress_wait "0" "10" "${_KEEP} Searching for rootfs..." "1"
|
||||||
if ! [[ -f "/mnt/efi/boot/initrd-${_ARCH}.img" ]] ; then
|
: >/.archboot
|
||||||
if ! mount /mnt/cdrom/efi.img /mnt/efi &>/dev/null; then
|
_task check &
|
||||||
_clear
|
_progress_wait "11" "12" "${_KEEP} Checking rootfs..." "1"
|
||||||
_wrn "Archboot Emergeny Shell:"
|
|
||||||
_wrn "Error: Didn't find a device with archboot rootfs!"
|
|
||||||
_msg "This needs further debugging. Please contact the archboot author."
|
|
||||||
_msg "Tobias Powalowski: tpowa@archlinux.org"
|
|
||||||
echo ""
|
|
||||||
systemctl start emergency.service
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
: >/.archboot
|
: >/.archboot
|
||||||
_task btrfs &
|
_task btrfs &
|
||||||
_progress_wait "11" "20" "${_KEEP} Creating btrfs on /dev/zram0..." "0.5"
|
_progress_wait "13" "20" "${_KEEP} Creating btrfs on /dev/zram0..." "0.5"
|
||||||
: >/.archboot
|
: >/.archboot
|
||||||
_task system &
|
_task system &
|
||||||
_progress_wait "21" "95" "${_KEEP} Copying rootfs to /sysroot..." "0.75"
|
_progress_wait "21" "95" "${_KEEP} Copying rootfs to /sysroot..." "0.75"
|
||||||
|
|
Loading…
Reference in a new issue