diff --git a/setup.sh b/setup.sh
index e6fd9a5..e35a0e1 100644
--- a/setup.sh
+++ b/setup.sh
@@ -149,7 +149,8 @@ echo "Done."
 
 echo ""
 echo "Setting up bpoo import service"
-echo "[Unit]\n    DefaultDependencies=no" > /mnt/etc/systemd/system/zfs-import-bpool.service
+echo "[Unit]"> /mnt/etc/systemd/system/zfs-import-bpool.service
+echo "    DefaultDependencies=no" >> /mnt/etc/systemd/system/zfs-import-bpool.service
 echo "    Before=zfs-import-scan.service" >> /mnt/etc/systemd/system/zfs-import-bpool.service
 echo "    Before=zfs-import-cache.service" >> /mnt/etc/systemd/system/zfs-import-bpool.service
 echo "" >> /mnt/etc/systemd/system/zfs-import-bpool.service
@@ -159,7 +160,6 @@ echo "    RemainAfterExit=yes" >> /mnt/etc/systemd/system/zfs-import-bpool.servi
 echo "    ExecStart=/sbin/zpool import -N -o cachefile=none bpool" >> /mnt/etc/systemd/system/zfs-import-bpool.service
 echo "[Install]" >> /mnt/etc/systemd/system/zfs-import-bpool.service
 echo "    WantedBy=zfs-import.target	"  >> /mnt/etc/systemd/system/zfs-import-bpool.service
-chmod +x /mnt/etc/systemd/system/zfs-import-bpool.service
 echo "Done."
 
 echo ""
@@ -207,7 +207,6 @@ echo "echo 'root:${rootpassword}' | chpasswd" >> /mnt/setup-chroot.sh
 echo "systemctl enable zfs-import-bpool.service" >> /mnt/setup-chroot.sh
 
 
-echo "exit 0" >> /mnt/setup-chroot.sh
 
 
 #cp /usr/sharesystemd/tmp.mount /etc/systemd/system/
@@ -259,6 +258,7 @@ echo "echo '${admin}:${rootpassword}' | chpasswd" >> /mnt/setup-chroot.sh
 
 
 
+echo "exit 0" >> /mnt/setup-chroot.sh
 
 #exit 0