From 4244c4cacca15db2e49cc9814cfc29d7d88ee60c Mon Sep 17 00:00:00 2001
From: simono41 <simono41>
Date: Thu, 30 Aug 2018 00:04:05 +0200
Subject: [PATCH] fix

---
 arch-install            | 2 +-
 make_mksquashfs-auto.sh | 2 +-
 packages_manjaro.txt    | 2 --
 snapshot.sh             | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/arch-install b/arch-install
index be34dd2..17c5588 100755
--- a/arch-install
+++ b/arch-install
@@ -799,7 +799,7 @@ function systemdboot() {
 
     #rootsub=$(btrfs subvolume list /mnt | awk 'NR<0 && NR>2 {print $2}')
     if [ "${version}" == "manjaro" ]; then
-        kernel1="$(echo $(find /boot/ -name "initramfs*.img") | cut -d" " -f4)"
+        kernel1="$(echo $(find /boot/ -name "initramfs*.img") | cut -d" " -f2)"
         linuz1="$(echo $(find /boot/ -name "vmlinuz*") | cut -d" " -f2)"
         kernel="${kernel1#/*/}"
         linuz="${linuz1#/*/}"
diff --git a/make_mksquashfs-auto.sh b/make_mksquashfs-auto.sh
index fc1c346..8878a7c 100755
--- a/make_mksquashfs-auto.sh
+++ b/make_mksquashfs-auto.sh
@@ -211,7 +211,7 @@ function BIOS() {
 
         cp -R ${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/* ${work_dir}/iso/${install_dir}/boot/syslinux/
 
-        cp "$(echo $(find /boot/ -name "${work_dir}/${arch}/airootfs/boot/initramfs*.img") | cut -d" " -f4)" ${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img
+        cp "$(echo $(find /boot/ -name "${work_dir}/${arch}/airootfs/boot/initramfs*.img") | cut -d" " -f2)" ${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img
         cp "$(echo $(find /boot/ -name "${work_dir}/${arch}/airootfs/boot/vmlinuz-linux*") | cut -d" " -f2)"  ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz
 
         cp ${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/isolinux.bin ${work_dir}/iso/isolinux/
diff --git a/packages_manjaro.txt b/packages_manjaro.txt
index 97dd577..db3d110 100644
--- a/packages_manjaro.txt
+++ b/packages_manjaro.txt
@@ -664,8 +664,6 @@ lightdm-gtk-greeter-settings
 links
 linux-api-headers
 linux-firmware
-linux316
-linux316-nvidia
 linux414
 linux414-nvidia
 lirc
diff --git a/snapshot.sh b/snapshot.sh
index c58af1f..651a538 100755
--- a/snapshot.sh
+++ b/snapshot.sh
@@ -44,7 +44,7 @@ if [ "make" == "$1" ]; then
         #stable-snapshot-boot
         if [ -f "/boot/arch-uefi.conf.example" ] && [ "${rootsnapshot}" == "y" ]; then
 
-            cp "$(echo $(find /boot/ -name "initramfs*.img") | cut -d" " -f4)" /boot/initramfs-linux-1.00-$(uname -m).img
+            cp "$(echo $(find /boot/ -name "initramfs*.img") | cut -d" " -f2)" /boot/initramfs-linux-1.00-$(uname -m).img
             cp "$(echo $(find /boot/ -name "vmlinuz*") | cut -d" " -f2)" /boot/vmlinuz-1.00-$(uname -m)
 
             kernel1="$(echo $(find /boot/ -name "initramfs*-1.00.img") | cut -d" " -f2)"