disable unused services for SMB and NFSv0.46.32

3 files changed, 17 insertions, 1 deletions

diff --git a/etc/nextcloudpi-config.d/NFS.sh b/etc/nextcloudpi-config.d/NFS.sh
index eff08d2e..7b990cf3 100644
--- a/etc/nextcloudpi-config.d/NFS.sh
+++ b/etc/nextcloudpi-config.d/NFS.sh
@@ -32,6 +32,7 @@ install()
   apt-get update
   apt-get install --no-install-recommends -y nfs-kernel-server 
   systemctl disable nfs-kernel-server
+  systemctl mask nfs-blkmap
 
   cat > /etc/systemd/system/nfs-common.services <<EOF
 [Unit]
diff --git a/etc/nextcloudpi-config.d/samba.sh b/etc/nextcloudpi-config.d/samba.sh
index 5dae603d..9a9153ba 100644
--- a/etc/nextcloudpi-config.d/samba.sh
+++ b/etc/nextcloudpi-config.d/samba.sh
@@ -29,6 +29,7 @@ install()
   apt-get update
   apt-get install --no-install-recommends -y samba
   update-rc.d smbd disable
+  update-rc.d nmbd disable
 
   # the directory needs to be recreated if we are using nc-ramlogs
   grep -q mkdir /etc/init.d/smbd || sed -i "/\<start)/amkdir -p /var/log/samba" /etc/init.d/smbd
@@ -47,7 +48,13 @@ EOF
 
 configure()
 {
-  [[ $ACTIVE_ != "yes" ]] && { service smbd stop; update-rc.d smbd disable; echo "SMB disabled"; return; } 
+  [[ $ACTIVE_ != "yes" ]] && { 
+    service smbd stop
+    update-rc.d smbd disable
+    update-rc.d nmbd disable
+    echo "SMB disabled"
+    return
+  } 
 
   # CHECKS
   ################################
@@ -107,6 +114,9 @@ EOF
   update-rc.d smbd enable
   service smbd start
 
+  update-rc.d nmbd enable
+  service nmbd start
+
   echo "SMB enabled"
 }
 
diff --git a/update.sh b/update.sh
index 835adac2..8706dde4 100755
--- a/update.sh
+++ b/update.sh
@@ -214,6 +214,11 @@ EOF
     systemctl start nc-provisioning
   }
 
+  # adjust services
+  systemctl mask nfs-blkmap
+  grep -q '^ACTIVE_=yes$' /usr/local/etc/nextcloudpi-config.d/samba.sh || \
+    update-rc.d nmbd disable
+
 } # end - only live updates
 
 exit 0