From 6fb54fd96095fb1a2c92f83cb353956ceba34ff5 Mon Sep 17 00:00:00 2001
From: simono41 <simono41>
Date: Fri, 8 Jun 2018 22:51:56 +0200
Subject: [PATCH 01/11] pi_fix

---
 arch-installpi-simon_os.sh => arch-installpi-spectre_os.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename arch-installpi-simon_os.sh => arch-installpi-spectre_os.sh (89%)

diff --git a/arch-installpi-simon_os.sh b/arch-installpi-spectre_os.sh
similarity index 89%
rename from arch-installpi-simon_os.sh
rename to arch-installpi-spectre_os.sh
index 3d4fff4..ccb2d35 100755
--- a/arch-installpi-simon_os.sh
+++ b/arch-installpi-spectre_os.sh
@@ -13,9 +13,9 @@ fdisk -l
 read -p "Wo soll das Image aufgespielt werden?: /dev/sda : " device
 [[ -z "${device}" ]] && device=/dev/sda
 
-if [ -f arch-simon_os-*-armV7.tar.gz ]
+if [ -f arch-spectre_os-*-armV7.tar.gz ]
 then
-    image=$(find arch-simon_os-*-armV7.tar.gz)
+    image=$(find arch-spectre_os-*-armV7.tar.gz)
     echo $datei
 else
     echo "ABGEBROCHEN"
@@ -84,7 +84,7 @@ mkfs.ext4 /dev/"$device"2
 mkdir -p root
 mount /dev/"$device"2 root
 
-tar -xpf arch-simon_os-*-armV7.tar.gz -C root
+tar -xpf arch-spectre_os-*-armV7.tar.gz -C root
 sync
 
 mv root/boot/* boot

From 5b0e5c0ebceaf57d0e1183ae9897aacdf436a143 Mon Sep 17 00:00:00 2001
From: simono41 <simono41>
Date: Fri, 8 Jun 2018 23:01:29 +0200
Subject: [PATCH 02/11] pi_pixz

---
 arch-installpi-spectre_os.sh             | 2 +-
 make_arch-pi.sh => make_spectre_os-pi.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename make_arch-pi.sh => make_spectre_os-pi.sh (89%)

diff --git a/arch-installpi-spectre_os.sh b/arch-installpi-spectre_os.sh
index ccb2d35..22dbf3a 100755
--- a/arch-installpi-spectre_os.sh
+++ b/arch-installpi-spectre_os.sh
@@ -84,7 +84,7 @@ mkfs.ext4 /dev/"$device"2
 mkdir -p root
 mount /dev/"$device"2 root
 
-tar -xpf arch-spectre_os-*-armV7.tar.gz -C root
+tar -Ipixz -xf arch-spectre_os-*-armV7.tar.gz -C root
 sync
 
 mv root/boot/* boot
diff --git a/make_arch-pi.sh b/make_spectre_os-pi.sh
similarity index 89%
rename from make_arch-pi.sh
rename to make_spectre_os-pi.sh
index b6149ac..1a25758 100755
--- a/make_arch-pi.sh
+++ b/make_spectre_os-pi.sh
@@ -38,7 +38,7 @@ cp -R boot/* root/boot/
 
 cd root/
 mkdir -p ../${out_dir}/
-tar -cpf ../${out_dir}/arch-${name}-$(date "+%y.%m.%d")-${arch}.tar.gz *
+tar -Ipixz -cf ../${out_dir}/arch-${name}-$(date "+%y.%m.%d")-${arch}.tar.gz *
 cd ..
 echo "FERTIG!!!"
 exit 0

From 48f1fe242239c233d2b24dcf7f022f06486f0c03 Mon Sep 17 00:00:00 2001
From: simono41 <simono41>
Date: Fri, 8 Jun 2018 23:03:09 +0200
Subject: [PATCH 03/11] permissions

---
 arch-installpi-spectre_os.sh | 2 +-
 make_spectre_os-pi.sh        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch-installpi-spectre_os.sh b/arch-installpi-spectre_os.sh
index 22dbf3a..968f7e9 100755
--- a/arch-installpi-spectre_os.sh
+++ b/arch-installpi-spectre_os.sh
@@ -84,7 +84,7 @@ mkfs.ext4 /dev/"$device"2
 mkdir -p root
 mount /dev/"$device"2 root
 
-tar -Ipixz -xf arch-spectre_os-*-armV7.tar.gz -C root
+tar -Ipixz -xpf arch-spectre_os-*-armV7.tar.gz -C root
 sync
 
 mv root/boot/* boot
diff --git a/make_spectre_os-pi.sh b/make_spectre_os-pi.sh
index 1a25758..efb131f 100755
--- a/make_spectre_os-pi.sh
+++ b/make_spectre_os-pi.sh
@@ -38,7 +38,7 @@ cp -R boot/* root/boot/
 
 cd root/
 mkdir -p ../${out_dir}/
-tar -Ipixz -cf ../${out_dir}/arch-${name}-$(date "+%y.%m.%d")-${arch}.tar.gz *
+tar -Ipixz -cpf ../${out_dir}/arch-${name}-$(date "+%y.%m.%d")-${arch}.tar.gz *
 cd ..
 echo "FERTIG!!!"
 exit 0

From b23f06d858e6c1fdf1b64e9d6ba5ca0a38c17e60 Mon Sep 17 00:00:00 2001
From: simono41 <simono41>
Date: Sat, 9 Jun 2018 00:08:39 +0200
Subject: [PATCH 04/11] update

---
 update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/update.sh b/update.sh
index 9e20f99..cb0b06f 100755
--- a/update.sh
+++ b/update.sh
@@ -46,7 +46,7 @@ then
                 echo "Git is not installet"
                 pacman -S git --needed --noconfirm
             fi
-            /opt/${repo}/arch-graphical-install-auto "${version}" "$2" "$3" "archchroot"
+            /opt/${repo}/arch-graphical-install-auto "${version}" "$2" "$3" "skip"
             read -p "Aktualisierung erfolgreich Abgeschlossen. Wollen sie den PC NEUSTARTEN?: [Y/n] " sicherheitsabfrage
             if [ "$sicherheitsabfrage" != "n" ]
             then

From 4015dad1f2c8b332d4f5c2d0406026a647cc02c2 Mon Sep 17 00:00:00 2001
From: simono41 <simono41>
Date: Sat, 9 Jun 2018 00:48:53 +0200
Subject: [PATCH 05/11] tar.pxz

---
 arch-installpi-spectre_os.sh | 6 +++---
 make_spectre_os-pi.sh        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch-installpi-spectre_os.sh b/arch-installpi-spectre_os.sh
index 968f7e9..7018d6e 100755
--- a/arch-installpi-spectre_os.sh
+++ b/arch-installpi-spectre_os.sh
@@ -13,9 +13,9 @@ fdisk -l
 read -p "Wo soll das Image aufgespielt werden?: /dev/sda : " device
 [[ -z "${device}" ]] && device=/dev/sda
 
-if [ -f arch-spectre_os-*-armV7.tar.gz ]
+if [ -f arch-spectre_os-*-armV7.tar.pxz ]
 then
-    image=$(find arch-spectre_os-*-armV7.tar.gz)
+    image=$(find arch-spectre_os-*-armV7.tar.pxz)
     echo $datei
 else
     echo "ABGEBROCHEN"
@@ -84,7 +84,7 @@ mkfs.ext4 /dev/"$device"2
 mkdir -p root
 mount /dev/"$device"2 root
 
-tar -Ipixz -xpf arch-spectre_os-*-armV7.tar.gz -C root
+tar -Ipixz -xpf arch-spectre_os-*-armV7.tar.pxz -C root
 sync
 
 mv root/boot/* boot
diff --git a/make_spectre_os-pi.sh b/make_spectre_os-pi.sh
index efb131f..f394a9b 100755
--- a/make_spectre_os-pi.sh
+++ b/make_spectre_os-pi.sh
@@ -38,7 +38,7 @@ cp -R boot/* root/boot/
 
 cd root/
 mkdir -p ../${out_dir}/
-tar -Ipixz -cpf ../${out_dir}/arch-${name}-$(date "+%y.%m.%d")-${arch}.tar.gz *
+tar -Ipixz -cpf ../${out_dir}/arch-${name}-$(date "+%y.%m.%d")-${arch}.tar.pxz *
 cd ..
 echo "FERTIG!!!"
 exit 0

From d2d8fd00f37235a7ac7cb6e53553d73537993222 Mon Sep 17 00:00:00 2001
From: simono41 <simono41>
Date: Sat, 9 Jun 2018 00:58:13 +0200
Subject: [PATCH 06/11] sync

---
 arch-installpi-spectre_os.sh | 2 ++
 make_spectre_os-pi.sh        | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/arch-installpi-spectre_os.sh b/arch-installpi-spectre_os.sh
index 7018d6e..be936e9 100755
--- a/arch-installpi-spectre_os.sh
+++ b/arch-installpi-spectre_os.sh
@@ -91,4 +91,6 @@ mv root/boot/* boot
 
 umount boot root
 
+sync
+
 echo "Fertig!!!"
diff --git a/make_spectre_os-pi.sh b/make_spectre_os-pi.sh
index f394a9b..7fc5383 100755
--- a/make_spectre_os-pi.sh
+++ b/make_spectre_os-pi.sh
@@ -40,5 +40,10 @@ cd root/
 mkdir -p ../${out_dir}/
 tar -Ipixz -cpf ../${out_dir}/arch-${name}-$(date "+%y.%m.%d")-${arch}.tar.pxz *
 cd ..
+
+umount boot root
+
+sync
+
 echo "FERTIG!!!"
 exit 0

From ac2f439b10f0a0ad6167e6073ef537f247be97df Mon Sep 17 00:00:00 2001
From: simono41 <simono41>
Date: Sat, 9 Jun 2018 07:14:38 +0200
Subject: [PATCH 07/11] btrfs_raid_fix

---
 arch-install | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch-install b/arch-install
index e2a44e9..e6b52ba 100755
--- a/arch-install
+++ b/arch-install
@@ -526,13 +526,13 @@ function grubinstall() {
 function btrfsformat() {
     if [ "$raid" == "raid0" ]; then
         if [ "${verschluesselung}" == "y" ]; then
-            mkfs.btrfs -f -m raid10 -d raid10 ${deviceluks} ${device1}
+            mkfs.btrfs -f -m raid0 -d raid0 ${deviceluks} ${device1}
         else
             mkfs.btrfs -f -m raid0 -d raid0 ${device}${rootpartitionnummer} ${device1}
         fi
     elif [ "$raid" == "raid1" ]; then
         if [ "${verschluesselung}" == "y" ]; then
-            mkfs.btrfs -f -m raid10 -d raid10 ${deviceluks} ${device1}
+            mkfs.btrfs -f -m raid1 -d raid1 ${deviceluks} ${device1}
         else
             mkfs.btrfs -f -m raid1 -d raid1 ${device}${rootpartitionnummer} ${device1}
         fi

From 9bf264850e0dd63cddc530657afd0288a377e929 Mon Sep 17 00:00:00 2001
From: simono41 <simono41>
Date: Sat, 9 Jun 2018 07:48:04 +0200
Subject: [PATCH 08/11] fstab_fix

---
 arch-install | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch-install b/arch-install
index e6b52ba..db466fb 100755
--- a/arch-install
+++ b/arch-install
@@ -462,8 +462,8 @@ function installation {
         for wort in ${autodiskdevice}
         do
             echo "fstab ${wort} wird erstellt!!!"
-            autodiskdevicedateisystem=$(blkid -s TYPE -o value ${usbkeydevice})
-            autodiskdeviceuuid=$(blkid -s UUID -o value ${usbkeydevice})
+            autodiskdevicedateisystem=$(blkid -s TYPE -o value ${autodiskdevice})
+            autodiskdeviceuuid=$(blkid -s UUID -o value ${autodiskdevice})
             mkdir -p ${mountpoint}/run/media/user1/${wort#/*/}
             echo "UUID=${autodiskdeviceuuid} /run/media/user1/${wort#/*/} ${autodiskdevicedateisystem} defaults 0 2" >> ${mountpoint}/etc/fstab
 
@@ -911,8 +911,8 @@ function abfrage() {
         for wort in ${autodiskdevice}
         do
             echo "fstab ${wort} wird erstellt!!!"
-            autodiskdevicedateisystem=$(blkid -s TYPE -o value ${usbkeydevice})
-            autodiskdeviceuuid=$(blkid -s UUID -o value ${usbkeydevice})
+            autodiskdevicedateisystem=$(blkid -s TYPE -o value ${autodiskdevice})
+            autodiskdeviceuuid=$(blkid -s UUID -o value ${autodiskdevice})
 
         done
 

From 585d2b8d0e0539ba5661ab2a5b7d1a02a868a66e Mon Sep 17 00:00:00 2001
From: simono41 <simono41>
Date: Sat, 9 Jun 2018 07:55:47 +0200
Subject: [PATCH 09/11] fehler

---
 arch-install | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch-install b/arch-install
index db466fb..234fc0b 100755
--- a/arch-install
+++ b/arch-install
@@ -462,8 +462,8 @@ function installation {
         for wort in ${autodiskdevice}
         do
             echo "fstab ${wort} wird erstellt!!!"
-            autodiskdevicedateisystem=$(blkid -s TYPE -o value ${autodiskdevice})
-            autodiskdeviceuuid=$(blkid -s UUID -o value ${autodiskdevice})
+            autodiskdevicedateisystem=$(blkid -s TYPE -o value ${wort})
+            autodiskdeviceuuid=$(blkid -s UUID -o value ${wort})
             mkdir -p ${mountpoint}/run/media/user1/${wort#/*/}
             echo "UUID=${autodiskdeviceuuid} /run/media/user1/${wort#/*/} ${autodiskdevicedateisystem} defaults 0 2" >> ${mountpoint}/etc/fstab
 
@@ -911,8 +911,8 @@ function abfrage() {
         for wort in ${autodiskdevice}
         do
             echo "fstab ${wort} wird erstellt!!!"
-            autodiskdevicedateisystem=$(blkid -s TYPE -o value ${autodiskdevice})
-            autodiskdeviceuuid=$(blkid -s UUID -o value ${autodiskdevice})
+            autodiskdevicedateisystem=$(blkid -s TYPE -o value ${wort})
+            autodiskdeviceuuid=$(blkid -s UUID -o value ${wort})
 
         done
 

From cc27fa89d240a87a7619c005e17ba5f1eded4e63 Mon Sep 17 00:00:00 2001
From: simono41 <simono41>
Date: Sat, 9 Jun 2018 08:20:47 +0200
Subject: [PATCH 10/11] vnc_fix

---
 arch-install | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/arch-install b/arch-install
index 234fc0b..968b0bb 100755
--- a/arch-install
+++ b/arch-install
@@ -919,14 +919,7 @@ function abfrage() {
 
     fi
 
-    if [ "${update}" != "n" ]; then
-        read -p "Do you want to activate the VNC protocol? : [y/N] " x11vnc
-        #        echo "This password is only valid for the current session !!!"
-        #        if [ "${x11vnc}" == "y" ]; then
-        #            x11vnc -storepasswd /etc/x11vnc.pass
-        #            systemctl restart x11vnc.service
-        #        fi
-    fi
+    read -p "Do you want to activate the VNC protocol? : [y/N] " x11vnc
 
     if [ "${offline}" != "n" ]; then
         read -p "Sould the system be started without a login? : [y/N] " autostart

From 70b867ec3887c5ca0d27ff1130854a2640f02bd3 Mon Sep 17 00:00:00 2001
From: simono41 <simono41>
Date: Sat, 9 Jun 2018 08:57:21 +0200
Subject: [PATCH 11/11] directory_fix

---
 arch-installpi-spectre_os.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch-installpi-spectre_os.sh b/arch-installpi-spectre_os.sh
index be936e9..ff5ad74 100755
--- a/arch-installpi-spectre_os.sh
+++ b/arch-installpi-spectre_os.sh
@@ -13,9 +13,9 @@ fdisk -l
 read -p "Wo soll das Image aufgespielt werden?: /dev/sda : " device
 [[ -z "${device}" ]] && device=/dev/sda
 
-if [ -f arch-spectre_os-*-armV7.tar.pxz ]
+if [ -f out/arch-spectre_os-*-armV7.tar.pxz ]
 then
-    image=$(find arch-spectre_os-*-armV7.tar.pxz)
+    image=$(find out/arch-spectre_os-*-armV7.tar.pxz)
     echo $datei
 else
     echo "ABGEBROCHEN"
@@ -84,7 +84,7 @@ mkfs.ext4 /dev/"$device"2
 mkdir -p root
 mount /dev/"$device"2 root
 
-tar -Ipixz -xpf arch-spectre_os-*-armV7.tar.pxz -C root
+tar -Ipixz -xpf out/arch-spectre_os-*-armV7.tar.pxz -C root
 sync
 
 mv root/boot/* boot