--- alx-src/trunk/alxconfig-ng/init.d/alxsettings 2005/03/09 00:13:01 229 +++ alx-src/trunk/alxconfig-ng/init.d/alxsettings 2005/04/12 20:46:52 239 @@ -11,7 +11,7 @@ #%before: #%after: -# $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/init.d/alxsettings,v 1.4 2005-03-09 00:13:01 niro Exp $ +# $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/init.d/alxsettings,v 1.7 2005-04-12 20:45:55 niro Exp $ # checks first if the client was already configured and if it has an valid serial # if not it runs the autoconfiguration script @@ -30,6 +30,7 @@ source /usr/lib/alxconfig-ng/functions/serial_functions source /usr/lib/alxconfig-ng/functions/config_network source /usr/lib/alxconfig-ng/functions/config_printers +source /usr/lib/alxconfig-ng/functions/config_sessions source /usr/lib/alxconfig-ng/functions/config_x11 #check if mysql is available @@ -123,6 +124,7 @@ #echo "sessions" #validate_sessions #echo + config_sessions # imports printer settings from db config_printing @@ -137,10 +139,6 @@ then source /etc/alxconfig-ng/serial - # if system is already configured, it *has* a hostname. - # so we take the hostname of this system here - source /etc/hostname - #start preliminary networking (dhcp) preliminary_network start @@ -174,7 +172,7 @@ HOSTNAME="${ALX_DEFAULT_HOSTNAME}" #update the hostname on the system for sure - echo "HOSTNAME=${HOSTNAME}" > /etc/hostname + echo "${HOSTNAME}" > /etc/hostname #start preliminary networking (dhcp) preliminary_network start