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

fix

Browse source
This commit is contained in:
simono41 2018-05-10 03:47:10 +02:00
parent a0204b2d69
commit d203205484
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
arch-install
View file

@ -12,6 +12,7 @@ version="${2}"
hostname="$(cat /etc/hostname)" hostname="$(cat /etc/hostname)"
[[ -z "${version}" ]] && version="${hostname#*-}" [[ -z "${version}" ]] && version="${hostname#*-}"
if [[ $EUID -ne 0 ]]; then if [[ $EUID -ne 0 ]]; then
echo "This script must be run as root" 1>&2 echo "This script must be run as root" 1>&2
sudo "$0" "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9" 2>&1 | tee /home/user1/install.log sudo "$0" "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9" 2>&1 | tee /home/user1/install.log
@ -704,15 +705,15 @@ function systemdboot() {
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}quiet splash" arch-chroot ${mountpoint} efibootmgr -c -d ${device} -p 1 -l \\${linuz} -L "Arch Linux efistub" -u "initrd=/${kernel} root=${tobootdevice} rw ${parameter}quiet splash"
fi 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
chmod +x ${mountpoint}/usr/bin/update-bootloader chmod +x ${mountpoint}/usr/bin/update-bootloader
if ! grep '${mountpoint}/usr/bin/update-bootloader' $RCLOCALSHUTDOWN; then if ! grep '/usr/bin/update-bootloader' $RCLOCALSHUTDOWN; then
echo "${mountpoint}/usr/bin/update-bootloader" >> ${mountpoint}/etc/rc.local.shutdown echo "${mountpoint}/usr/bin/update-bootloader" >> $RCLOCALSHUTDOWN
fi fi
fi fi
@ -894,6 +895,8 @@ function abfrage() {
fi fi
fi fi
RCLOCALSHUTDOWN='${mountpoint}/etc/rc.local.shutdown'
# Partitionierung # Partitionierung
if [ "${m2ssddevice}" == "y" ]; then if [ "${m2ssddevice}" == "y" ]; then