as REBOOT_NEEDED variable is independant on every module, the function to set it is no longuer needed
This commit is contained in:
13
lib/utils.sh
13
lib/utils.sh
@@ -60,17 +60,4 @@ set_system_proxy()
|
|||||||
}
|
}
|
||||||
export -f set_system_proxy
|
export -f set_system_proxy
|
||||||
|
|
||||||
|
|
||||||
# ------------------------------------------------------------------------------
|
|
||||||
# Set a reboot nedeed flag to display a warning at the end
|
|
||||||
set_reboot_needed()
|
|
||||||
{
|
|
||||||
if [[ $NEED_REBOOT==true ]]; then
|
|
||||||
# Reboot flag already set, nothing to do
|
|
||||||
return 0
|
|
||||||
else
|
|
||||||
export NEED_REBOOT=true
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# EOF
|
# EOF
|
||||||
|
|||||||
@@ -20,7 +20,7 @@
|
|||||||
# * DEFAULT_SHELL: The shell to use when creating new users
|
# * DEFAULT_SHELL: The shell to use when creating new users
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
|
|
||||||
export VER_authnz=0.2.0
|
export VER_authnz=0.2.1
|
||||||
export DEP_authnz="upgrade_dist"
|
export DEP_authnz="upgrade_dist"
|
||||||
|
|
||||||
# Users (from Ldap)
|
# Users (from Ldap)
|
||||||
@@ -119,6 +119,7 @@ authnz()
|
|||||||
prnt I "Creating user $usr..."
|
prnt I "Creating user $usr..."
|
||||||
create_local_user $usr
|
create_local_user $usr
|
||||||
done
|
done
|
||||||
|
NEED_REBOOT=true
|
||||||
}
|
}
|
||||||
|
|
||||||
precheck_authnz()
|
precheck_authnz()
|
||||||
|
|||||||
@@ -20,7 +20,7 @@
|
|||||||
# * NET{4,6}_MANUAL_FILE_$iface: filename for manual configuration of $iface
|
# * NET{4,6}_MANUAL_FILE_$iface: filename for manual configuration of $iface
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
|
|
||||||
export VER_conf_network="0.0.7"
|
export VER_conf_network="0.0.8"
|
||||||
export DEP_conf_network="install_pkg"
|
export DEP_conf_network="install_pkg"
|
||||||
|
|
||||||
conf_network()
|
conf_network()
|
||||||
@@ -101,7 +101,7 @@ conf_network()
|
|||||||
done
|
done
|
||||||
|
|
||||||
unset iface if_file
|
unset iface if_file
|
||||||
set_reboot_needed
|
NEED_REBOOT=true
|
||||||
}
|
}
|
||||||
|
|
||||||
precheck_conf_network()
|
precheck_conf_network()
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
# * X11_DRV: Used to install proprietary driver for X.org (eg: nvidia-drivers)
|
# * X11_DRV: Used to install proprietary driver for X.org (eg: nvidia-drivers)
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
|
|
||||||
export VER_install_desktop="0.0.4"
|
export VER_install_desktop="0.0.5"
|
||||||
export DEP_install_desktop="upgrade_dist"
|
export DEP_install_desktop="upgrade_dist"
|
||||||
|
|
||||||
install_desktop()
|
install_desktop()
|
||||||
@@ -28,7 +28,8 @@ install_desktop()
|
|||||||
prnt I "Installing $UBUNTU_FLAVOR environment..."
|
prnt I "Installing $UBUNTU_FLAVOR environment..."
|
||||||
pkginst ${UBUNTU_FLAVOR}-desktop
|
pkginst ${UBUNTU_FLAVOR}-desktop
|
||||||
fi
|
fi
|
||||||
set_reboot_needed
|
# Because we're lazy but manual actions can avoid reboot...
|
||||||
|
NEED_REBOOT=true
|
||||||
}
|
}
|
||||||
|
|
||||||
precheck_install_desktop()
|
precheck_install_desktop()
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
# https://opensource.org/licenses/BSD-3-Clause
|
# https://opensource.org/licenses/BSD-3-Clause
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
|
|
||||||
export VER_select_system_proxy="0.0.2"
|
export VER_select_system_proxy="0.0.3"
|
||||||
export DEP_select_system_proxy="upgrade_dist"
|
export DEP_select_system_proxy="upgrade_dist"
|
||||||
|
|
||||||
select_system_proxy()
|
select_system_proxy()
|
||||||
@@ -20,7 +20,7 @@ select_system_proxy()
|
|||||||
else
|
else
|
||||||
prnt I "Pas de configurtion proxy, rien à faire."
|
prnt I "Pas de configurtion proxy, rien à faire."
|
||||||
fi
|
fi
|
||||||
set_reboot_needed
|
NEED_REBOOT=true
|
||||||
}
|
}
|
||||||
|
|
||||||
precheck_select_system_proxy()
|
precheck_select_system_proxy()
|
||||||
|
|||||||
Reference in New Issue
Block a user