Merge branch 'master' of ssh://192.168.178.21:30022/home/git/SpectreOS

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})
+            autodiskdevicedateisystem=$(blkid -s TYPE -o value ${wort})
-            autodiskdeviceuuid=$(blkid -s UUID -o value ${usbkeydevice})
+            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
 
@@ -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
@@ -911,22 +911,15 @@ function abfrage() {
         for wort in ${autodiskdevice}
         do
             echo "fstab ${wort} wird erstellt!!!"
-            autodiskdevicedateisystem=$(blkid -s TYPE -o value ${usbkeydevice})
+            autodiskdevicedateisystem=$(blkid -s TYPE -o value ${wort})
-            autodiskdeviceuuid=$(blkid -s UUID -o value ${usbkeydevice})
+            autodiskdeviceuuid=$(blkid -s UUID -o value ${wort})
 
         done
 
 
     fi
 
-    if [ "${update}" != "n" ]; then
+    read -p "Do you want to activate the VNC protocol? : [y/N] " x11vnc
-        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
 
     if [ "${offline}" != "n" ]; then
         read -p "Sould the system be started without a login? : [y/N] " autostart

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 out/arch-spectre_os-*-armV7.tar.pxz ]
 then
-    image=$(find arch-simon_os-*-armV7.tar.gz)
+    image=$(find out/arch-spectre_os-*-armV7.tar.pxz)
     echo $datei
 else
     echo "ABGEBROCHEN"
@@ -84,11 +84,13 @@ mkfs.ext4 /dev/"$device"2
 mkdir -p root
 mount /dev/"$device"2 root
 
-tar -xpf arch-simon_os-*-armV7.tar.gz -C root
+tar -Ipixz -xpf out/arch-spectre_os-*-armV7.tar.pxz -C root
 sync
 
 mv root/boot/* boot
 
 umount boot root
 
+sync
+
 echo "Fertig!!!"

make_spectre_os-pi.sh

@@ -38,7 +38,12 @@ 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 -cpf ../${out_dir}/arch-${name}-$(date "+%y.%m.%d")-${arch}.tar.pxz *
 cd ..
+
+umount boot root
+
+sync
+
 echo "FERTIG!!!"
 exit 0

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