fatalerrors/init.sh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

support for system locale configuration, few cleanup

Browse Source
This commit is contained in:
levasseur
2021-06-16 14:47:41 +02:00
parent 2f9eb19ebe
commit 7c336cede2
5 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
conf/includes/legos.conf.sh
View File

@@ -11,8 +11,9 @@ export PROXYSRVPORT="3128"
export RMLIST="apparmor laptop-detect resolvconf" export RMLIST="apparmor laptop-detect resolvconf"
export APTBLACKLIST="apparmor chafa resolvconf" export APTBLACKLIST="apparmor chafa resolvconf"
# Langues supportés # Langues supportés et langue du systême
export LOCALESET="en_US.UTF-8 fr_FR.UTF-8" export LOCALESET="en_US.UTF-8 fr_FR.UTF-8"
export SYSLOCALE="fr_FR.UTF-8"
# Liste des paquets de base, utiles dans tous les cas # Liste des paquets de base, utiles dans tous les cas
export INSTLIST_BASE="bc curl dc debconf-utils deborphan dos2unix dump \ export INSTLIST_BASE="bc curl dc debconf-utils deborphan dos2unix dump \

8
conf/init.conf.sh
View File

@@ -3,11 +3,11 @@
# Importe les paramètres spécifiques LEGOS # Importe les paramètres spécifiques LEGOS
. $MYPATH/conf/includes/legos.conf.sh . $MYPATH/conf/includes/legos.conf.sh
# Importe les paramètres pour Debian # Importe les paramètres pour Debian et Ubuntu
. $MYPATH/conf/includes/debian.conf.sh . $MYPATH/conf/includes/debian.conf.sh
# -------------- Section générale --------------- # -------------- Section générale ---------------
# Utilisateur de la machine (celui qui sera renseigné dans l'installeur Ubuntu) # Utilisateur de la machine (celui qui a été renseigné dans l'installeur Ubuntu)
export MAINUSER="levasseur" export MAINUSER="levasseur"
# Interface réseau principale # Interface réseau principale
@@ -25,7 +25,7 @@ export WITH_VM="true"
export UBUNTU_FLAVOR=xubuntu export UBUNTU_FLAVOR=xubuntu
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# -------------- Section disque de calcul --------------- # -------------------- Section disque de calcul ---------------------
# Niveau ZFS : mirror (RAID1), raidz1 (RAID5), raidz2 (RAID6) # Niveau ZFS : mirror (RAID1), raidz1 (RAID5), raidz2 (RAID6)
# Laisser vide pour RAID0 # Laisser vide pour RAID0
export CALCLEVEL="" export CALCLEVEL=""
@@ -38,6 +38,6 @@ export CALCDRV="/dev/disk/by-id/xxxxx"
export FORCEBLANK="no" export FORCEBLANK="no"
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# -------------- Section modules d'init --------------- # -------------------- Section modules d'init ---------------------
export MODULE_LIST="upgrade_dist conf_disks conf_locale conf_ntp conf_ssh \ export MODULE_LIST="upgrade_dist conf_disks conf_locale conf_ntp conf_ssh \
install_desktop install_pkg" install_desktop install_pkg"

3
init.sh
View File

@@ -73,7 +73,8 @@ install_profile()
# Supervision # Supervision
patch_snmp() patch_snmp()
{ {
backupdist /etc/snmp/snmpd.conf /etc/default/snmpd /lib/systemd/system/snmpd.service /etc/init.d/snmpd backupdist /etc/snmp/snmpd.conf /etc/default/snmpd /lib/systemd/system/snmpd.service \
/etc/init.d/snmpd
installfile snmpd.conf /etc/snmp/snmpd.conf installfile snmpd.conf /etc/snmp/snmpd.conf
installfile snmpd.init /etc/init.d/snmpd installfile snmpd.init /etc/init.d/snmpd
[[ -e /lib/systemd/system/snmpd.service ]] && [[ -e /lib/systemd/system/snmpd.service ]] &&

18
modules/conf_locale.sh
View File

@@ -1,6 +1,6 @@
# Locale # Locale
export VER_conf_locale="0.0.1" export VER_conf_locale="0.0.2"
conf_locale() conf_locale()
{ {
@@ -11,13 +11,23 @@ conf_locale()
done done
prnt I "Régénération du cache de locale..." prnt I "Régénération du cache de locale..."
locale-gen locale-gen
prnt I "Définition de la langue du systême..."*
[[ ! $SYSLOCALE ]] && export SYSLOCALE=C
local fname=/etc/default/locale
backupdist $fname
echo "# Generated by init on $(stdtime)" > $fname
echo "LANG=$SYSLOCALE" >> $fname
for cfg in ADDRESS IDENTIFICATION MEASUREMENT MONETARY NAME NUMERIC PAPER \
TELEPHONE TIME; do
echo "LC_$cfg=$SYSLOCALE"
done
} }
precheck_conf_locale() precheck_conf_locale()
{ {
if [[ ! $LOCALESET ]]; then [[ ! $LOCALESET ]] && prnt W "Aucune locale définie !"
prnt W "Aucune locale définie !" [[ ! $SYSLOCALE ]] && prnt W "Pas de locale systême définie, C sera utilié."
fi
} }
export -f conf_locale export -f conf_locale

2
modules/conf_ntp.sh
View File

@@ -16,7 +16,7 @@ conf_ntp()
line="${line}server $srv iburst\n" line="${line}server $srv iburst\n"
done done
sed -i -e "s/@SERVERLIST@/$line/" $dest && sed -i -e "s/@SERVERLIST@/$line/" $dest &&
echo "# Generated on $(date --rfc-3339=seconds)" >> $dest && echo "# Generated on $(stdtime)" >> $dest &&
mv -fv $dest /etc/ntp.conf mv -fv $dest /etc/ntp.conf
prnt I "Démarrage du service ntp..." prnt I "Démarrage du service ntp..."