From 4bde687989cf94338d4552ccc12acadc442e41c1 Mon Sep 17 00:00:00 2001
From: simono41 <simono41>
Date: Thu, 3 May 2018 15:35:31 +0200
Subject: [PATCH] bootfix-and-lookfix

---
 arch-install            | 44 ++++++++++++++++-------------------------
 make_mksquashfs-auto.sh | 14 ++++++-------
 packages_manjaro.txt    |  4 ++++
 3 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/arch-install b/arch-install
index 6c67fe9..690a454 100755
--- a/arch-install
+++ b/arch-install
@@ -657,6 +657,18 @@ function systemdboot() {
     fi
 
     #rootsub=$(btrfs subvolume list /mnt | awk 'NR<0 && NR>2 {print $2}')
+    if [ "${version}" == "manjaro" ]; then
+      kernel1="$(find /boot/ -name "initramfs*$(uname -m).img")"
+      linuz1="$(find /boot/ -name "vmlinuz*$(uname -m)")"
+      kernel="${kernel1#/*/}"
+      linuz="${linuz1#/*/}"
+      kernelback1="$(find /boot/ -name "initramfs*$(uname -m)-fallback.img")"
+      kernelback="${kernelback1#/*/}"
+    else
+      kernel="initramfs-linux.img"
+      linuz="vmlinuz-linux"
+      kernelback="initramfs-linux-fallback.img"
+    fi
 
     mkdir -p ${mountpoint}/boot/EFI/systemd/
     mkdir -p ${mountpoint}/boot/EFI/BOOT/
@@ -665,31 +677,17 @@ function systemdboot() {
 
     mkdir -p ${mountpoint}/boot/loader/entries/
     echo "title    "${repo}"" > ${mountpoint}/boot/loader/entries/arch-uefi.conf
-    echo "linux    /vmlinuz-linux" >> ${mountpoint}/boot/loader/entries/arch-uefi.conf
+    echo "linux    /${linuz}" >> ${mountpoint}/boot/loader/entries/arch-uefi.conf
     echo "initrd   /intel-ucode.img" >> ${mountpoint}/boot/loader/entries/arch-uefi.conf
-    echo "initrd   /initramfs-linux.img" >> ${mountpoint}/boot/loader/entries/arch-uefi.conf
+    echo "initrd   /${kernel}" >> ${mountpoint}/boot/loader/entries/arch-uefi.conf
     echo "options  root=${tobootdevice} rw ${parameter}quiet splash" >> ${mountpoint}/boot/loader/entries/arch-uefi.conf
 
     echo "title    "${repo}"" > ${mountpoint}/boot/loader/entries/arch-uefi-fallback.conf
-    echo "linux    /vmlinuz-linux" >> ${mountpoint}/boot/loader/entries/arch-uefi-fallback.conf
+    echo "linux    /${linuz}" >> ${mountpoint}/boot/loader/entries/arch-uefi-fallback.conf
     echo "initrd   /intel-ucode.img" >> ${mountpoint}/boot/loader/entries/arch-uefi-fallback.conf
-    echo "initrd   /initramfs-linux-fallback.img" >> ${mountpoint}/boot/loader/entries/arch-uefi-fallback.conf
+    echo "initrd   /${kernelback}" >> ${mountpoint}/boot/loader/entries/arch-uefi-fallback.conf
     echo "options  root=${tobootdevice} rw ${parameter}quiet splash" >> ${mountpoint}/boot/loader/entries/arch-uefi-fallback.conf
 
-    #if [ "${version}" != "libre" ]; then
-    #echo "title    "${repo}-lts"" > ${mountpoint}/boot/loader/entries/arch-uefi-lts.conf
-    #echo "linux    /vmlinuz-linux-lts" >> ${mountpoint}/boot/loader/entries/arch-uefi-lts.conf
-    #echo "initrd   /intel-ucode.img" >> ${mountpoint}/boot/loader/entries/arch-uefi-lts.conf
-    #echo "initrd   /initramfs-linux-lts.img" >> ${mountpoint}/boot/loader/entries/arch-uefi-lts.conf
-    #echo "options  root=${tobootdevice} rw ${parameter}nvidia-drm.modeset=1 quiet splash" >> ${mountpoint}/boot/loader/entries/arch-uefi-lts.conf
-
-    #echo "title    "${repo}-lts"" > ${mountpoint}/boot/loader/entries/arch-uefi-fallback-lts.conf
-    #echo "linux    /vmlinuz-linux-lts" >> ${mountpoint}/boot/loader/entries/arch-uefi-fallback-lts.conf
-    #echo "initrd   /intel-ucode.img" >> ${mountpoint}/boot/loader/entries/arch-uefi-fallback-lts.conf
-    #echo "initrd   /initramfs-linux-fallback-lts.img" >> ${mountpoint}/boot/loader/entries/arch-uefi-fallback-lts.conf
-    #echo "options  root=${tobootdevice} rw ${parameter}nvidia-drm.modeset=1 quiet splash" >> ${mountpoint}/boot/loader/entries/arch-uefi-fallback-lts.conf
-    #fi
-
     echo "default   arch-uefi" > ${mountpoint}/boot/loader/loader.conf
     echo "timeout   1" >> ${mountpoint}/boot/loader/loader.conf
 
@@ -699,15 +697,7 @@ 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 \vmlinuz-linux -L "Arch Linux efistub" -u "initrd=/initramfs-linux.img root=${tobootdevice} rw ${parameter}quiet splash"
-
-        #if [ "${version}" != "libre" ]; then
-        #arch-chroot ${mountpoint} efibootmgr -c -d ${device} -p 1 -l \vmlinuz-linux-lts -L "Arch Linux efistub" -u "initrd=/initramfs-linux-lts.img root=${tobootdevice} rw ${parameter}nvidia-drm.modeset=1 quiet splash"
-        #fi
-        # überschreibt die efistub deswegen entfernt
-        #arch-chroot ${mountpoint} efibootmgr -c -d ${device} -p 1 -l \vmlinuz-linux -L "Arch Linux fallback efistub" -u "initrd=/initramfs-linux-fallback.img root=${tobootdevice} rw ${parameter}nvidia-drm.modeset=1 quiet splash"
-
-        #arch-chroot ${mountpoint} bootctl install
+        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
 
diff --git a/make_mksquashfs-auto.sh b/make_mksquashfs-auto.sh
index a534b38..0fc5843 100755
--- a/make_mksquashfs-auto.sh
+++ b/make_mksquashfs-auto.sh
@@ -207,13 +207,13 @@ function BIOS() {
 
         cp -R ${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/* ${work_dir}/iso/${install_dir}/boot/syslinux/
 
-        cp $(find ${work_dir}/${arch}/airootfs/boot/ -name "initramfs*$(uname -m).img") ${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img
-        cp $(find ${work_dir}/${arch}/airootfs/boot/ -name "vmlinuz*$(uname -m)") ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz
-
-        #if [ "${version}" != "libre" ]; then
-        #cp ${work_dir}/${arch}/airootfs/boot/initramfs-linux-lts.img ${work_dir}/iso/${install_dir}/boot/${arch}/archiso-lts.img
-        #cp ${work_dir}/${arch}/airootfs/boot/vmlinuz-linux-lts ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz-lts
-        #fi
+        if [ "${version}" == "manjaro" ]; then
+          cp $(find ${work_dir}/${arch}/airootfs/boot/ -name "initramfs*$(uname -m).img") ${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img
+          cp $(find ${work_dir}/${arch}/airootfs/boot/ -name "vmlinuz*$(uname -m)") ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz
+        else
+          cp ${work_dir}/${arch}/airootfs/boot/initramfs-linux${linuxparameter}.img ${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img
+          cp ${work_dir}/${arch}/airootfs/boot/vmlinuz-linux${linuxparameter} ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz
+        fi
 
         cp ${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/isolinux.bin ${work_dir}/iso/isolinux/
         cp ${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/isohdpfx.bin ${work_dir}/iso/isolinux/
diff --git a/packages_manjaro.txt b/packages_manjaro.txt
index b5cc123..94b9425 100644
--- a/packages_manjaro.txt
+++ b/packages_manjaro.txt
@@ -14,6 +14,8 @@ android-udev
 appstream-glib
 apr
 apr-util
+arc-gtk-theme
+arc-icon-theme
 archlinux-appstream-data
 archlinux-keyring
 argon2
@@ -860,6 +862,7 @@ thunar-archive-plugin
 thunar-media-tags-plugin
 thunar-volman
 thunderbird
+tigervnc
 tlp
 tolua++
 tslib
@@ -909,6 +912,7 @@ wildmidi
 wireless-regdb
 woff2
 wpa_supplicant
+x11vnc
 x265
 xcb-proto
 xcb-util