simono41/SpectreOS-old
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dual-bootloader

Browse source
This commit is contained in:
simono41 2018-08-21 22:12:40 +02:00
parent 6469b7e2c4
commit b73733ac79
2 changed files with 8 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
arch-install
View file

@ -830,15 +830,11 @@ function systemdboot() {
echo "initrd /%KERNEL%" >> ${mountpoint}/boot/arch-uefi.conf.example 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 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"
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
if [ "${version}" == "manjaro" ]; then if [ "${version}" == "manjaro" ]; then
cp /opt/${repo}/update-bootloader ${mountpoint}/usr/bin/update-bootloader cp /opt/${repo}/update-bootloader ${mountpoint}/usr/bin/update-bootloader
@ -862,8 +858,6 @@ function abfrage() {
[[ -z "${Partition}" ]] && Partition=bios [[ -z "${Partition}" ]] && Partition=bios
[[ -z "${boot}" ]] && boot=grub
[[ -z "${device}" ]] && device=/dev/sda [[ -z "${device}" ]] && device=/dev/sda
[[ -z "${raid}" ]] && raid=n [[ -z "${raid}" ]] && raid=n
@ -920,16 +914,6 @@ function abfrage() {
[[ -z "${Partition}" ]] && Partition=bios [[ -z "${Partition}" ]] && Partition=bios
fi 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 fdisk -l
read -p "Specify a hard disk: /dev/sda " device read -p "Specify a hard disk: /dev/sda " device
[[ -z "${device}" ]] && device=/dev/sda [[ -z "${device}" ]] && device=/dev/sda
@ -1288,13 +1272,9 @@ then
fi fi
fi fi
echo "" echo ""
if [ "${boot}" == "grub" ] arch-chroot ${mountpoint} grub-install --target=x86_64-efi --efi-directory=/boot --bootloader-id="${repo}" --recheck
then arch-chroot ${mountpoint} grub-mkconfig -o /boot/grub/grub.cfg
arch-chroot ${mountpoint} grub-install --target=x86_64-efi --efi-directory=/boot --bootloader-id="${repo}" --recheck systemdboot
arch-chroot ${mountpoint} grub-mkconfig -o /boot/grub/grub.cfg
else
systemdboot
fi
removeinstaller removeinstaller
echo "Finished" echo "Finished"
elif [ "${Partition}" == "bios" ]; then elif [ "${Partition}" == "bios" ]; then

4
make_mksquashfs-auto.sh
View file

@ -62,11 +62,11 @@ EOT
if [ "${version}" == "libre" ]; then if [ "${version}" == "libre" ]; then
cp pacman.conf_libre /etc/pacman.conf 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) ./pacstrap -C pacman.conf_libre -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base_libre.txt)
elif [ "${version}" == "manjaro" ]; then elif [ "${version}" == "manjaro" ]; then
cp pacman.conf_manjaro /etc/pacman.conf 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) ./pacstrap -C pacman.conf_manjaro -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base.txt)
else else
cp pacman.conf /etc/pacman.conf cp pacman.conf /etc/pacman.conf