From e28cfc01a0da6c15407d1926ecba0a08008addc0 Mon Sep 17 00:00:00 2001
From: simono41 <simono41>
Date: Sun, 8 Apr 2018 18:49:31 +0200
Subject: [PATCH] systemd-nspawn -b -D

---
 arch-graphical-install-auto | 20 +++++++++++++++++---
 make_mksquashfs-auto.sh     |  8 +++++---
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/arch-graphical-install-auto b/arch-graphical-install-auto
index 061f4ea..ec77c2a 100755
--- a/arch-graphical-install-auto
+++ b/arch-graphical-install-auto
@@ -363,10 +363,24 @@ if [ "${version}" != "libre" ]; then
     aurinstall plymouth-theme-dark-arch
     plymouth-set-default-theme -R dark-arch
     aurinstall snapd
-    systemctl enable snapd
+    systemctl enable --now snapd.socket
+    if ! [ -d "/snap" ];then
+      ln -s /var/lib/snapd/snap /snap
+    fi
     snap install spotify
-    ln -s /var/lib/snapd/snap/bin/spotify /usr/bin/spotify
-    ln -s /var/lib/snapd/desktop/applications/spotify_spotify.desktop /usr/share/applications/spotify_spotify.desktop
+    if ! [ -f "/usr/bin/spotify" ];then
+      ln -s /var/lib/snapd/snap/bin/spotify /usr/bin/spotify
+    fi
+    if ! [ -f "/usr/share/applications/spotify_spotify.desktop" ];then
+      ln -s /var/lib/snapd/desktop/applications/spotify_spotify.desktop /usr/share/applications/spotify_spotify.desktop
+    fi
+    snap install skype
+    if ! [ -f "/usr/bin/skype" ];then
+      ln -s /var/lib/snapd/snap/bin/skype /usr/bin/skype
+    fi
+    if ! [ -f "/usr/share/applications/skype_skypeforlinux.desktop" ];then
+      ln -s /var/lib/snapd/desktop/applications/skype_skypeforlinux.desktop /usr/share/applications/skype_skypeforlinux.desktop
+    fi
 fi
 
 
diff --git a/make_mksquashfs-auto.sh b/make_mksquashfs-auto.sh
index 2c489fb..425a85f 100755
--- a/make_mksquashfs-auto.sh
+++ b/make_mksquashfs-auto.sh
@@ -35,9 +35,9 @@ function minimalinstallation() {
     cp mirrorlist* /etc/pacman.d/
 
     if [ "${version}" == "libre" ]; then
-        ./pacstrap -C /etc/pacman.conf_libre -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base.txt)
+        ./pacstrap -C /etc/pacman.conf_libre -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base.txt) --ignore linux
     else
-        ./pacstrap -C /etc/pacman.conf -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base.txt)
+        ./pacstrap -C /etc/pacman.conf -c -d -G -M ${work_dir}/${arch}/airootfs $(cat base.txt) --ignore linux
     fi
 }
 
@@ -394,7 +394,9 @@ if [ "${parameter2}" != "skip" ]; then
 
     echo "Jetzt können sie ihr Betriebssystem nach ihren Belieben anpassen:D"
     cp arch-graphical-install-auto ${work_dir}/${arch}/airootfs/usr/bin/arch-graphical-install-auto
-    ./arch-chroot ${work_dir}/${arch}/airootfs /usr/bin/arch-graphical-install-auto ${version}
+    systemd-nspawn -b -u root -D ${work_dir}/${arch}/airootfs <<EOT
+/usr/bin/arch-graphical-install-auto ${version}
+EOT
 
 fi