From 19281f3ee6d4edef90bfa2588ebf8d1d6dcd126c Mon Sep 17 00:00:00 2001
From: sean <sean>
Date: Tue, 9 Jul 2019 18:40:44 -0700
Subject: [PATCH] tweaks

---
 setup.sh | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/setup.sh b/setup.sh
index 4eb9f2c..8a7ab3c 100644
--- a/setup.sh
+++ b/setup.sh
@@ -149,16 +149,17 @@ echo "Done."
 
 echo ""
 echo "Setting up bpoo import service"
-echo "[Unit]\n    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
-echo "[Service]" >> /mnt/etc/systemd/system/zfs-import-bpool.Service
-echo "    Type=oneshot" >> /mnt/etc/systemd/system/zfs-import-bpool.Service
-echo "    RemainAfterExit=yes" >> /mnt/etc/systemd/system/zfs-import-bpool.Service
-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
+echo "[Unit]\n    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
+echo "[Service]" >> /mnt/etc/systemd/system/zfs-import-bpool.service
+echo "    Type=oneshot" >> /mnt/etc/systemd/system/zfs-import-bpool.service
+echo "    RemainAfterExit=yes" >> /mnt/etc/systemd/system/zfs-import-bpool.service
+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 ""
@@ -203,8 +204,7 @@ echo "done" >> /mnt/setup-chroot.sh
 echo "apt install -y grub-efi-amd64-signed shim-signed" >> /mnt/setup-chroot.sh
 echo "echo 'root:${rootpassword}' | chpasswd" >> /mnt/setup-chroot.sh
 
-
-echo "systemctl enable zfs-import-bpool.Service" >> /mnt/setup-chroot.sh
+echo "systemctl enable zfs-import-bpool.service" >> /mnt/setup-chroot.sh
 
 
 echo "exit 0" >> /mnt/setup-chroot.sh
@@ -249,10 +249,10 @@ echo "systemctl enable ssh">> /mnt/setup-chroot.sh
 
 # create parker user automated way
 echo "zfs create rpool/home/$admin" >> /mnt/setup-chroot.sh
-echo "adduser $admin" >> /mnt/setup-chroot.sh
+echo "useradd $admin" >> /mnt/setup-chroot.sh
 echo "cp -a /etc/skel/.[!.]* /home/$admin" >> /mnt/setup-chroot.sh
 echo "chown -R ${admin}:${admin} /home/$admin" >> /mnt/setup-chroot.sh
-echo "usermod -a -G adm,cdrom,dip,lpadmin,plugdev,sambashare,sudo $admin" >> /mnt/setup-chroot.sh
+echo "usermod -a -G adm,cdrom,dip,plugdev,sudo $admin" >> /mnt/setup-chroot.sh
 echo "echo '${admin}:${rootpassword}' | chpasswd" >> /mnt/setup-chroot.sh
 
 #create swap space, too if necessary