keeping logs
This commit is contained in:
parent
218bb28bad
commit
2ed9faeb5a
|
|
@ -14,7 +14,7 @@ fi
|
||||||
echo "basic installations"
|
echo "basic installations"
|
||||||
install_pkg networkmanager dhclient reflector \
|
install_pkg networkmanager dhclient reflector \
|
||||||
rsync arch-install-scripts \
|
rsync arch-install-scripts \
|
||||||
git pacman-contrib curl
|
git pacman-contrib curl efibootmgr
|
||||||
|
|
||||||
install_xorg() {
|
install_xorg() {
|
||||||
install_pkg xorg xorg-server xorg-xinit
|
install_pkg xorg xorg-server xorg-xinit
|
||||||
|
|
@ -167,7 +167,7 @@ grub)
|
||||||
install_pkg grub os-prober
|
install_pkg grub os-prober
|
||||||
if [[ "$LUKS" -eq 1 ]]; then
|
if [[ "$LUKS" -eq 1 ]]; then
|
||||||
echo "Installing GRUB for LUKS"
|
echo "Installing GRUB for LUKS"
|
||||||
sed -i -e 's/GRUB_CMDLINE_LINUX="\(.\+\)"/GRUB_CMDLINE_LINUX="\1 cryptdevice=UUID='"${ENCRYPT_UUID}"':luks"/g' -e 's/GRUB_CMDLINE_LINUX=""/GRUB_CMDLINE_LINUX="cryptdevice=UUID'"${ENCRYPT_UUID}"':luks"/g' /etc/default/grub
|
sed -i -e 's/GRUB_CMDLINE_LINUX="\(.\+\)"/GRUB_CMDLINE_LINUX="\1 cryptdevice=UUID='"${ENCRYPT_UUID}"':luks"/g' -e 's/GRUB_CMDLINE_LINUX=""/GRUB_CMDLINE_LINUX="cryptdevice=UUID='"${ENCRYPT_UUID}"':luks"/g' /etc/default/grub
|
||||||
fi
|
fi
|
||||||
if [[ "$UEFI" -eq 1 ]]; then
|
if [[ "$UEFI" -eq 1 ]]; then
|
||||||
grub-install --target=x86_64-efi --efi-directory=/boot --bootloader-id=ArchTitus
|
grub-install --target=x86_64-efi --efi-directory=/boot --bootloader-id=ArchTitus
|
||||||
|
|
|
||||||
|
|
@ -27,8 +27,11 @@ logo() {
|
||||||
"
|
"
|
||||||
}
|
}
|
||||||
|
|
||||||
do_reboot () {
|
copy_logs() {
|
||||||
cp "$LOG" "$MOUNTPOINT"/var/log/archtitus.log
|
cp "$LOG" "$MOUNTPOINT"/var/log/archtitus.log
|
||||||
|
}
|
||||||
|
|
||||||
|
do_reboot () {
|
||||||
if [[ "$LVM" -eq 1 || "$LUKS" -eq 1 ]]; then
|
if [[ "$LVM" -eq 1 || "$LUKS" -eq 1 ]]; then
|
||||||
i=0
|
i=0
|
||||||
while [[ "$i" -le "${#LVM_NAMES[@]}" ]]; do
|
while [[ "$i" -le "${#LVM_NAMES[@]}" ]]; do
|
||||||
|
|
@ -42,6 +45,7 @@ do_reboot () {
|
||||||
|
|
||||||
end() {
|
end() {
|
||||||
REBOOT="true"
|
REBOOT="true"
|
||||||
|
copy_logs
|
||||||
for (( i = 15; i >= 1; i-- )); do
|
for (( i = 15; i >= 1; i-- )); do
|
||||||
read -r -s -n 1 -t 1 -p "Rebooting in $i seconds... Press Esc key to abort or press R key to reboot now."$'\n' KEY
|
read -r -s -n 1 -t 1 -p "Rebooting in $i seconds... Press Esc key to abort or press R key to reboot now."$'\n' KEY
|
||||||
CODE="$?"
|
CODE="$?"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue