From 8bb69f931d013d07b90be6901fc1360759ffa114 Mon Sep 17 00:00:00 2001
From: fatalerrors <geoffray.levasseurbrandin@numericable.fr>
Date: Fri, 18 Jun 2021 11:34:22 +0200
Subject: [PATCH] managing systemd-timesyncd in conf_ntp, make use of die
 instead of exit

---
 modules/authnz.sh          |  2 +-
 modules/conf_disks.sh      |  8 ++++----
 modules/conf_ntp.sh        | 11 +++++++++--
 modules/install_desktop.sh |  2 +-
 modules/install_pkg.sh     |  2 +-
 modules/upgrade_dist.sh    |  6 +++---
 6 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/modules/authnz.sh b/modules/authnz.sh
index 9637674..183f057 100644
--- a/modules/authnz.sh
+++ b/modules/authnz.sh
@@ -14,7 +14,7 @@ add_users()
 # Authentication
 authnz()
 {
-    pkginst nscd libpam-krb5 libnss-ldap libpam-ldap
+    pkginst krb5-user libpam-krb5 libnss-ldap libpam-ldap nscd
 
     backupdist /etc/krb5.conf /etc/libnss-ldap.conf /etc/pam_ldap.conf \
 	       /etc/nsswitch.conf /etc/pam.d/common-session \
diff --git a/modules/conf_disks.sh b/modules/conf_disks.sh
index 1a3df0d..63d9945 100644
--- a/modules/conf_disks.sh
+++ b/modules/conf_disks.sh
@@ -1,6 +1,6 @@
 # Configuration du disque de calcul
 
-export VER_conf_disk="0.0.2"
+export VER_conf_disk="0.0.4"
 
 # ------------------------------------------------------------------------------
 # Cas de ZFS
@@ -96,7 +96,7 @@ precheck_conf_disk()
 {
     if [[ ! $(type -t conf_$CALCTYPE) == "function" ]]; then
 	prnt E "Format de disque inconnu ($CALCTYPE) !"
-	exit 1
+	die 5
     fi
 	
     prnt I "Vérification des lecteurs pour disque de calcul."
@@ -116,14 +116,14 @@ precheck_conf_disk()
 	    fi
 	else
 	    prnt E "Le disque $drv n'existe pas. Abandon."
-	    exit 1
+	    die 5
 	fi
 	(( drvcount+=1 ))    
     done
     
     if [[ ! $CALCTYPE=="zfs" && drvcount -gt 1 ]]; then
 	prnt E "Plusieurs diques impossibles avec Ext4 ou XFS !"
-	exit 1
+	die 5
     fi
 }
 
diff --git a/modules/conf_ntp.sh b/modules/conf_ntp.sh
index d97eaae..65ded9e 100644
--- a/modules/conf_ntp.sh
+++ b/modules/conf_ntp.sh
@@ -1,9 +1,16 @@
 # NTP
 
-export VER_conf_ntp="0.0.2"
+export VER_conf_ntp="0.0.3"
 
 conf_ntp()
 {
+    if [[ $(pidof systemd) ]]; then
+        prnt I "Désactivation de Systemd-timesyncd..."
+        systemctl disable systemd-timesyncd || true
+    fi
+
+    prnt I "Installation du démon ntp..."
+    pkginst ntp
     prnt I "Arrêt du service ntp..."
     svc_stop ntp
 
@@ -28,7 +35,7 @@ precheck_conf_ntp()
 {
     if [[ ! $NTPSERVERS ]]; then
 	prnt E "Pas de serveur NTP configuré !"
-	exit 1
+	die 5
     fi
 }
 
diff --git a/modules/install_desktop.sh b/modules/install_desktop.sh
index 670e171..4efc65c 100644
--- a/modules/install_desktop.sh
+++ b/modules/install_desktop.sh
@@ -15,7 +15,7 @@ install_desktop()
 
 precheck_install_desktop()
 {
-    [[ ! $UBUNTU_FLAVOR ]] && prnt W "Pas de saveur Ubuntu choisi, \
+    [[ ! $UBUNTU_FLAVOR ]] && prnt W "Pas de saveur Ubuntu choisie, \
        aucun environnement de bureau ne sera installé !"
     [[ $X11_DRV ]] && prnt W "Des pilotes non libres seront installé."
 }
diff --git a/modules/install_pkg.sh b/modules/install_pkg.sh
index cbd79a5..fae596c 100644
--- a/modules/install_pkg.sh
+++ b/modules/install_pkg.sh
@@ -5,7 +5,7 @@ export VER_install_pkg="0.0.1"
 install_pkg()
 {
     [[ $PKGLIST ]] &&
-	prnt I "Installation des la sélection de paquets..." &&
+	prnt I "Installation de la sélection de paquets..." &&
 	pkginst $PKGSEL
 }
 
diff --git a/modules/upgrade_dist.sh b/modules/upgrade_dist.sh
index 9975329..9b9c582 100644
--- a/modules/upgrade_dist.sh
+++ b/modules/upgrade_dist.sh
@@ -1,6 +1,6 @@
 # Module mise à jour de la distribution
 
-export VER_upgrade_dist="0.0.2"
+export VER_upgrade_dist="0.0.3"
 
 upgrade_dist()
 {
@@ -37,12 +37,12 @@ precheck_upgrade_dist()
     wget -q --tries=10 --timeout=20 --spider http://google.com
     if [[ ! $? -eq 0 ]]; then
 	prnt E "Réseau non fonctionnel ! Abandon."
-	exit 1
+	die 5
     fi
     if [[ $PROXYAPT ]]; then
 	[[ ! $PROXYAPTPORT ]] && (
 	    prnt E "Un serveur proxy a été spécifié mais pas son port d'usage."
-	    exit 1
+	    die 5
 	)
     fi
 }