From b73733ac795ddb38da91f5b6c15cd0fc7ca1374e Mon Sep 17 00:00:00 2001
From: simono41 <simono41>
Date: Tue, 21 Aug 2018 22:12:40 +0200
Subject: [PATCH] dual-bootloader

---
 arch-install            | 32 ++++++--------------------------
 make_mksquashfs-auto.sh |  4 ++--
 2 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/arch-install b/arch-install
index ab552f7..0fe03dd 100755
--- a/arch-install
+++ b/arch-install
@@ -830,15 +830,11 @@ function systemdboot() {
   echo "initrd   /%KERNEL%" >> ${mountpoint}/boot/arch-uefi.conf.example
   echo "options  root=${tobootdevice} rw ${parameter}nvidia-drm.modeset=1 splash" >> ${mountpoint}/boot/arch-uefi.conf.example
 
-  if [ "${booteintraege}" != "n" ]; then
+  echo "Additional boot entries are created !!!"
 
-    echo "Additional boot entries are created !!!"
+  arch-chroot ${mountpoint} efibootmgr -c -d ${device} -p 1 -l /EFI/systemd/systemd-bootx64.efi -L "Linux Boot Manager"
 
-    arch-chroot ${mountpoint} efibootmgr -c -d ${device} -p 1 -l /EFI/systemd/systemd-bootx64.efi -L "Linux Boot Manager"
-
-    arch-chroot ${mountpoint} efibootmgr -c -d ${device} -p 1 -l \\${linuz} -L "Arch Linux efistub" -u "initrd=/${kernel} root=${tobootdevice} rw ${parameter}nvidia-drm.modeset=1 splash"
-
-  fi
+  arch-chroot ${mountpoint} efibootmgr -c -d ${device} -p 1 -l \\${linuz} -L "Arch Linux efistub" -u "initrd=/${kernel} root=${tobootdevice} rw ${parameter}nvidia-drm.modeset=1 splash"
 
   if [ "${version}" == "manjaro" ]; then
     cp /opt/${repo}/update-bootloader ${mountpoint}/usr/bin/update-bootloader
@@ -862,8 +858,6 @@ function abfrage() {
 
     [[ -z "${Partition}" ]] && Partition=bios
 
-    [[ -z "${boot}" ]] && boot=grub
-
     [[ -z "${device}" ]] && device=/dev/sda
 
     [[ -z "${raid}" ]] && raid=n
@@ -920,16 +914,6 @@ function abfrage() {
       [[ -z "${Partition}" ]] && Partition=bios
     fi
 
-    if [ "${Partition}" == "uefi" ]
-    then
-      read -p "Should be booted with systemd or with grub? [systemd/GRUB] : " boot
-      if [ "${boot}" == "systemd" ]; then
-        read -p "Should additional boot entries be created? [Y/n] : " booteintraege
-      fi
-
-    fi
-    [[ -z "${boot}" ]] && boot=grub
-
     fdisk -l
     read -p "Specify a hard disk: /dev/sda " device
     [[ -z "${device}" ]] && device=/dev/sda
@@ -1288,13 +1272,9 @@ then
     fi
   fi
   echo ""
-  if [ "${boot}" == "grub" ]
-  then
-    arch-chroot ${mountpoint} grub-install --target=x86_64-efi --efi-directory=/boot --bootloader-id="${repo}" --recheck
-    arch-chroot ${mountpoint} grub-mkconfig -o /boot/grub/grub.cfg
-  else
-    systemdboot
-  fi
+  arch-chroot ${mountpoint} grub-install --target=x86_64-efi --efi-directory=/boot --bootloader-id="${repo}" --recheck
+  arch-chroot ${mountpoint} grub-mkconfig -o /boot/grub/grub.cfg
+  systemdboot
   removeinstaller
   echo "Finished"
 elif [ "${Partition}" == "bios" ]; then
diff --git a/make_mksquashfs-auto.sh b/make_mksquashfs-auto.sh
index 495b190..1dbfa00 100755
--- a/make_mksquashfs-auto.sh
+++ b/make_mksquashfs-auto.sh
@@ -62,11 +62,11 @@ EOT
 
     if [ "${version}" == "libre" ]; then
         cp pacman.conf_libre /etc/pacman.conf
-        pacman -U --noconfirm --force https://www.parabola.nu/packages/libre/any/parabola-keyring/download
+        pacman -U --noconfirm --force "https://www.parabola.nu/packages/libre/any/parabola-keyring/download"
         ./pacstrap -C pacman.conf_libre -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base_libre.txt)
     elif [ "${version}" == "manjaro" ]; then
         cp pacman.conf_manjaro /etc/pacman.conf
-        pacman -U --noconfirm --force https://mirror.philpot.de/manjaro/stable/core/x86_64/manjaro-keyring-20171027-2-any.pkg.tar.xz
+        pacman -U --noconfirm --force "https://mirror.philpot.de/manjaro/stable/core/x86_64/manjaro-keyring-20180607-1-any.pkg.tar.xz"
         ./pacstrap -C pacman.conf_manjaro -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base.txt)
     else
         cp pacman.conf /etc/pacman.conf