From b9452a4b69012fb9008d9d858b6ad117cb546217 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 18 Jun 2018 20:02:10 +0000
Subject: LinHES-config: mv_fileshare.py: remove nfs-common service when
 disabling nfs.

LinHES-release: bump to R8.5.2
---
 abs/core/LinHES-config/LinHES-release  | 2 +-
 abs/core/LinHES-config/PKGBUILD        | 6 +++---
 abs/core/LinHES-config/mv_fileshare.py | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/abs/core/LinHES-config/LinHES-release b/abs/core/LinHES-config/LinHES-release
index b3360a3..5afb5ff 100644
--- a/abs/core/LinHES-config/LinHES-release
+++ b/abs/core/LinHES-config/LinHES-release
@@ -1 +1 @@
-LinHES R8.5.1 (Gareth)
+LinHES R8.5.2 (Gareth)
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 5f7e92b..c744cac 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-config
 pkgver=8.5.2
-pkgrel=1
+pkgrel=2
 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
 pkgdesc="Install and configure your system"
 depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -160,7 +160,7 @@ md5sums=('7d8581ac5260617630078f2206d33117'
          'f0376c98a7986897406d393186c0365e'
          '157e73d0f90d7b306aba8f5921aeedd3'
          '1f58c0393a131f4a8f9a84b3fe08a7e4'
-         '55ac9212faa4efa7f9cb67a35640817e'
+         '03ab4c6af061da01584b450ec83f26ed'
          '5f890ea9bda6aef652d2560ca19dac07'
          'ab2aa42c2947148c2b1cac0ade6d1d55'
          'd429b59d3cfb37b0624c6a4a71a7c2c0'
@@ -183,7 +183,7 @@ md5sums=('7d8581ac5260617630078f2206d33117'
          '8be8ce5f1d8522b1cde12d34840865c2'
          '80685e047993b00161be29e3580f3a40'
          '0e1c98392887b6efcb3f8b04ead7c4f9'
-         '3cb673adb83b6afa52cffaa621b9d96b'
+         '3d84d2b508a73733e8d593e551b21081'
          '781f161a79c3188a31c8615b8258b241'
          '44e32e7015612cbf5d9f6539f4b6799b'
          '6cb0aac63623a44463c4209862d2baa0'
diff --git a/abs/core/LinHES-config/mv_fileshare.py b/abs/core/LinHES-config/mv_fileshare.py
index 5844a2f..3311bb8 100755
--- a/abs/core/LinHES-config/mv_fileshare.py
+++ b/abs/core/LinHES-config/mv_fileshare.py
@@ -441,6 +441,7 @@ def setup_NFSshares(UseNFS,templatefile,data_config,servername,nfslist):
     else:
         logging.info("    Removing NFS server")
         mv_common.remove_service("nfsd")
+        mv_common.remove_service("nfs-common")
     return
 
 def setup_dyndns(DDnsEnable):
-- 
cgit v0.12