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

Major version update

Browse Source
This commit is contained in:
natemaia 2018-12-17 22:19:08 -08:00
parent d5174bbab5
commit 6613c71132
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/archlabs-installer
View File

@ -8,7 +8,7 @@
# Some ideas and code has been taken from other installers # Some ideas and code has been taken from other installers
# AIF, Cnichi, Calamares, The Arch Wiki.. Credit where credit is due # AIF, Cnichi, Calamares, The Arch Wiki.. Credit where credit is due
VER="1.7.60" # Installer version VER="1.8.0" # Installer version
DIST="ArchLabs" # Installer distributor DIST="ArchLabs" # Installer distributor
MNT="/mnt" # Installer mountpoint MNT="/mnt" # Installer mountpoint
ERR="/tmp/errlog" # error log used internally ERR="/tmp/errlog" # error log used internally
@ -2157,14 +2157,12 @@ setup_grub()
fi fi
# the mount mess is needed for os-prober to work properly in the chroot # the mount mess is needed for os-prober to work properly in the chroot
BCMDS[grub]="${BCMDS[grub]} --efi-directory=${BMNTS[UEFI-grub]} --bootloader-id=$DIST && BCMDS[grub]="mkdir -p /run/udev && mkdir -p /run/lvm &&
mkdir -p /run/udev &&
mkdir -p /run/lvm &&
mount --bind /hostrun/udev /run/udev && mount --bind /hostrun/udev /run/udev &&
mount --bind /hostrun/lvm /run/lvm && mount --bind /hostrun/lvm /run/lvm &&
${BCMDS[grub]} --efi-directory=${BMNTS[UEFI-grub]} --bootloader-id=$DIST &&
grub-mkconfig -o /boot/grub/grub.cfg && grub-mkconfig -o /boot/grub/grub.cfg &&
umount /run/udev && umount /run/udev && umount /run/lvm"
umount /run/lvm"
fi fi
return 0 return 0
@ -2288,7 +2286,7 @@ install_bootloader()
prerun_$BOOTLDR prerun_$BOOTLDR
printf "\nInstalling and setting up $BOOTLDR in ${BMNTS[$SYS-$BOOTLDR]}\n\n" printf "\nInstalling and setting up $BOOTLDR in ${BMNTS[$SYS-$BOOTLDR]}\n\n"
chrun "${BCMDS[$BOOTLDR]}" chrun "${BCMDS[$BOOTLDR]}" 2>$ERR
echeck "${BCMDS[$BOOTLDR]}" echeck "${BCMDS[$BOOTLDR]}"
if [[ -d $MNT/hostrun ]]; then if [[ -d $MNT/hostrun ]]; then