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

improved checks display on some modules

Browse Source
This commit is contained in:
levasseur
2022-02-18 18:19:15 +01:00
parent 3f554d8bb7
commit 198763c01c
3 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/conf_network.sh
View File

@@ -119,14 +119,14 @@ precheck_conf_network()
if [[ -z $(eval echo \$NET4_IP_$iface) ]]; then if [[ -z $(eval echo \$NET4_IP_$iface) ]]; then
prnt E "No IPv4 have been assigned to static interface $iface!" prnt E "No IPv4 have been assigned to static interface $iface!"
fi fi
prnt I " * Interface $iface will have $(eval echo \$NET4_IP_$iface) static IPv4 address." prnt m " * Interface $iface will have $(eval echo \$NET4_IP_$iface) static IPv4 address."
;; ;;
"dhcp") "dhcp")
prnt I " * Interface $iface will use DHCP." prnt m " * Interface $iface will use DHCP."
;; ;;
"manual") "manual")
file_must_exists $(eval echo \$NET4_MANUAL_FILE_$iface) file_must_exists $(eval echo \$NET4_MANUAL_FILE_$iface)
prnt I " * Interface $iface will use manual IPv4 configuration in a file." prnt m " * Interface $iface will use manual IPv4 configuration in a file."
;; ;;
*) *)
prnt E "Interfaces mode \"$(eval echo \$NET4_MODE_$iface)\" unsuported!" prnt E "Interfaces mode \"$(eval echo \$NET4_MODE_$iface)\" unsuported!"
@@ -148,14 +148,14 @@ precheck_conf_network()
if [[ -z $(eval echo \$NET6_IP_$iface) ]]; then if [[ -z $(eval echo \$NET6_IP_$iface) ]]; then
prnt E "No IPv6 have been assigned to static interface $iface!" prnt E "No IPv6 have been assigned to static interface $iface!"
fi fi
prnt I " * Interface $iface will have $(eval echo \$NET6_IP_$iface) static IPv6 address." prnt m " * Interface $iface will have $(eval echo \$NET6_IP_$iface) static IPv6 address."
;; ;;
"dhcp") "dhcp")
prnt I " * Interface $iface will use DHCPv6." prnt m " * Interface $iface will use DHCPv6."
;; ;;
"manual") "manual")
file_must_exists $(eval echo \$NET6_MANUAL_FILE_$iface) file_must_exists $(eval echo \$NET6_MANUAL_FILE_$iface)
prnt I " * Interface $iface will use manual IPv6 configuration in a file." prnt m " * Interface $iface will use manual IPv6 configuration in a file."
;; ;;
*) *)
prnt E "Interfaces mode \"$(eval echo \$NET6_MODE_$iface)\" unsuported!" prnt E "Interfaces mode \"$(eval echo \$NET6_MODE_$iface)\" unsuported!"

10
modules/install_desktop.sh
View File

@@ -21,11 +21,11 @@ export DEP_install_desktop="upgrade_dist"
install_desktop() install_desktop()
{ {
if [[ -n $X11_DRV ]]; then if [[ -n $X11_DRV ]]; then
prnt I "Installation de pilotes supplémentaires X11..." prnt I "Installing additionnal X11 drivers..."
pkginst $X11_DRV pkginst $X11_DRV
fi fi
if [[ $UBUNTU_FLAVOR ]]; then if [[ $UBUNTU_FLAVOR ]]; then
prnt I "Installation de l'environnement $UBUNTU_FLAVOR..." prnt I "Installing $UBUNTU_FLAVOR environment..."
pkginst ${UBUNTU_FLAVOR}-desktop pkginst ${UBUNTU_FLAVOR}-desktop
fi fi
set_reboot_needed set_reboot_needed
@@ -34,12 +34,12 @@ install_desktop()
precheck_install_desktop() precheck_install_desktop()
{ {
if [[ -z $UBUNTU_FLAVOR ]]; then if [[ -z $UBUNTU_FLAVOR ]]; then
prnt W "Pas de saveur Ubuntu choisie, aucun environnement de bureau ne sera installé !" prnt W "No Ubuntu flavor chosen, no desktop environment will be installed!"
else else
prnt m "La saveur $UBUNTU_FLAVOR sera installée..." prnt m " * The flavor $UBUNTU_FLAVOR will be installed..."
fi fi
if [[ -n $X11_DRV ]]; then if [[ -n $X11_DRV ]]; then
prnt W "Des pilotes non libres seront installé." prnt W "Non free drivers will be installed."
fi fi
} }

12
modules/install_pkg.sh
View File

@@ -52,20 +52,22 @@ install_pkg()
precheck_install_pkg() precheck_install_pkg()
{ {
if [[ -z PKGS_RMLIST ]]; then if [[ -z PKGS_RMLIST ]]; then
prnt I "No package to remove." prnt m " * No package to remove."
else else
prnt I "$(echo $PKGS_RMLIST | wc -w) package to remove." prnt m " * $(echo $PKGS_RMLIST | wc -w) package to remove."
fi fi
if [[ -z PKGS_BLACKLIST ]]; then if [[ -z PKGS_BLACKLIST ]]; then
prnt W "The packages $pkg will be placed into the blacklist !" prnt m " * The packages $pkg will be placed into the blacklist !"
file_must_exists pkgman/blacklist.conf file_must_exists pkgman/blacklist.conf
else
prnt m " * No package to blacklist."
fi fi
if [[ -z $PKGSEL ]]; then if [[ -z $PKGSEL ]]; then
prnt W "No additionnal package to install !" prnt m " * No additionnal package to install !"
else else
prnt I "$(echo $PKGSEL | wc -w) additionnal package have to be installed." prnt m " * $(echo $PKGSEL | wc -w) additionnal package have to be installed."
fi fi
} }