xstefen/al-installer
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Break up some messages with newlines

Browse Source
This commit is contained in:
natemaia 2018-12-16 21:16:27 -08:00
parent 23e7e82d83
commit db9629d5cb
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/archlabs-installer
View File

@ -10,7 +10,7 @@
# immutable globals # immutable globals
readonly VER="1.7.44" # Installer version readonly VER="1.7.45" # Installer version
readonly DIST="ArchLabs" # Linux distributor readonly DIST="ArchLabs" # Linux distributor
readonly MNT="/mnt" # Install mountpoint readonly MNT="/mnt" # Install mountpoint
readonly ERR="/tmp/errlog" # Built-in error log readonly ERR="/tmp/errlog" # Built-in error log

3
src/lib/boot.sh
View File

@ -214,6 +214,7 @@ install_bootloader()
echeck "${BCMDS[$BOOTLDR]}" echeck "${BCMDS[$BOOTLDR]}"
if [[ -d $MNT/hostrun ]]; then if [[ -d $MNT/hostrun ]]; then
printf "\n"
umount $MNT/hostrun/udev >/dev/null 2>&1 umount $MNT/hostrun/udev >/dev/null 2>&1
umount $MNT/hostrun/lvm >/dev/null 2>&1 umount $MNT/hostrun/lvm >/dev/null 2>&1
rm -rf $MNT/hostrun >/dev/null 2>&1 rm -rf $MNT/hostrun >/dev/null 2>&1
@ -237,6 +238,7 @@ uefi_boot_fallback()
default="$(find $esp/EFI/ -maxdepth 1 -mindepth 1 -name '[Bb][oO][oO][tT]' -type d)" default="$(find $esp/EFI/ -maxdepth 1 -mindepth 1 -name '[Bb][oO][oO][tT]' -type d)"
default="$(basename $default)" default="$(basename $default)"
printf "\n"
if [[ -d $esp/EFI/$default ]]; then if [[ -d $esp/EFI/$default ]]; then
rm -rfv $esp/EFI/$default/* rm -rfv $esp/EFI/$default/*
else else
@ -245,6 +247,7 @@ uefi_boot_fallback()
cp -fv $esp/EFI/$DIST/grubx64.efi $esp/EFI/$default/bootx64.efi cp -fv $esp/EFI/$DIST/grubx64.efi $esp/EFI/$default/bootx64.efi
sleep 2
return 0 return 0
} }

8
src/lib/install.sh
View File

@ -57,7 +57,7 @@ install()
install_base() install_base()
{ {
if [[ -e /run/archiso/sfs/airootfs/etc/skel ]]; then if [[ -e /run/archiso/sfs/airootfs/etc/skel ]]; then
printf "\n\nUnpacking base system --- Total: ~ 2.6G\n" printf "\n\nUnpacking base system --- Total: ~ 2.6G\n\n"
rsync -ah --info=progress2 /run/archiso/sfs/airootfs/ $MNT/ rsync -ah --info=progress2 /run/archiso/sfs/airootfs/ $MNT/
else else
oneshot mirrorlist_sort oneshot mirrorlist_sort
@ -72,6 +72,7 @@ install_base()
pacstrap $MNT base $KERNEL $UCODE $packages $vmpkgs pacstrap $MNT base $KERNEL $UCODE $packages $vmpkgs
fi fi
printf "\n"
rm -rf $MNT/etc/mkinitcpio-archiso.conf rm -rf $MNT/etc/mkinitcpio-archiso.conf
find $MNT/usr/lib/initcpio -name 'archiso*' -type f -exec rm '{}' \; find $MNT/usr/lib/initcpio -name 'archiso*' -type f -exec rm '{}' \;
sed -i 's/volatile/auto/g' $MNT/etc/systemd/journald.conf sed -i 's/volatile/auto/g' $MNT/etc/systemd/journald.conf
@ -94,10 +95,11 @@ EOF
[[ $UCODE && ! $VM ]] && cp -vf $RUN/${UCODE/-/_}.img $MNT/boot/${UCODE}.img [[ $UCODE && ! $VM ]] && cp -vf $RUN/${UCODE/-/_}.img $MNT/boot/${UCODE}.img
fi fi
printf "\n"
cp -fv /etc/resolv.conf $MNT/etc/
if [[ -e /etc/NetworkManager/system-connections ]]; then if [[ -e /etc/NetworkManager/system-connections ]]; then
cp -rvf /etc/NetworkManager/system-connections $MNT/etc/NetworkManager/ cp -rvf /etc/NetworkManager/system-connections $MNT/etc/NetworkManager/
fi fi
cp -fv /etc/resolv.conf $MNT/etc/
cat > $MNT/etc/locale.conf << EOF cat > $MNT/etc/locale.conf << EOF
LANG=$LOCALE LANG=$LOCALE
@ -107,7 +109,7 @@ LANG=$LOCALE
EOF EOF
sed -i "s/#en_US.UTF-8/en_US.UTF-8/g; s/#${LOCALE}/${LOCALE}/g" $MNT/etc/locale.gen sed -i "s/#en_US.UTF-8/en_US.UTF-8/g; s/#${LOCALE}/${LOCALE}/g" $MNT/etc/locale.gen
chrun "echo && locale-gen" 2>/dev/null chrun "echo && locale-gen" 2>/dev/null
printf "\n"
chrun "ln -svf /usr/share/zoneinfo/$ZONE/$SUBZONE /etc/localtime" 2>/dev/null chrun "ln -svf /usr/share/zoneinfo/$ZONE/$SUBZONE /etc/localtime" 2>/dev/null
if [[ $BROADCOM_WL == true ]]; then if [[ $BROADCOM_WL == true ]]; then