Magellan Linux

  • Back to homepage
    • /[alx-svn]/alx-src/branches/alxconf-060/init.d/alxsettings

    Diff of /alx-src/branches/alxconf-060/init.d/alxsettings

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 2121 by niro, Wed May 11 09:19:45 2011 UTC revision 2122 by niro, Mon May 16 11:08:31 2011 UTC
    # Line 302  import_settings_to_db() Line 302  import_settings_to_db()
    302   [[ $(< ${SETTINGSPATH}/confd-networking) != ${iface} ]] && continue   [[ $(< ${SETTINGSPATH}/confd-networking) != ${iface} ]] && continue
    303   echo "WARNING: only importing settings for interface [ ${iface} ] !"   echo "WARNING: only importing settings for interface [ ${iface} ] !"
    304   source ${network_settings}/net.${iface} || exit 1   source ${network_settings}/net.${iface} || exit 1
    305   NETCARD_DRIVER="$(cat /etc/modules.d/net.${iface} | cut -d' ' -f3)"   NETCARD_DRIVER="$(cat /etc/modprobe.d/net.${iface}.conf | cut -d' ' -f3)"
    306    
    307   mysqldo "insert into cfg_network(   mysqldo "insert into cfg_network(
    308   hostname,   hostname,
    # Line 475  update_settings_in_db() Line 475  update_settings_in_db()
    475   [[ $(< ${SETTINGSPATH}/confd-networking) != ${iface} ]] && continue   [[ $(< ${SETTINGSPATH}/confd-networking) != ${iface} ]] && continue
    476   echo "WARNING: only importing settings for interface [ ${iface} ] !"   echo "WARNING: only importing settings for interface [ ${iface} ] !"
    477   source ${network_settings}/net.${iface} || exit 1   source ${network_settings}/net.${iface} || exit 1
    478   NETCARD_DRIVER="$(cat /etc/modules.d/net.${iface} | cut -d' ' -f3)"   NETCARD_DRIVER="$(cat /etc/modprobe.d/net.${iface}.conf | cut -d' ' -f3)"
    479    
    480   mysqldo "update cfg_network set   mysqldo "update cfg_network set
    481   hostname='${ALX_DEFAULT_HOSTNAME}',   hostname='${ALX_DEFAULT_HOSTNAME}',
    # Line 758  reset_system_settings() Line 758  reset_system_settings()
    758   rm -rf /etc/alxconfig-ng/state   rm -rf /etc/alxconfig-ng/state
    759    
    760   # clear all printers & net-shares   # clear all printers & net-shares
    761   :> /etc/cups/printers.conf   :> /etc/printcap
      :> /etc/samba/smb.conf  
    762    
    763   # remove inetd, cups & smb from init   # remove lprng
    764   rc-config del inetd &> /dev/null   rc-config del lprng &> /dev/null
      rc-config del cups &> /dev/null  
      rc-config del samba &> /dev/null  
    765    
    766   # remove all user settings   # remove all user settings
    767   [ -d ${ALX_UNPRIV_HOME} ] && rm -rf ${ALX_UNPRIV_HOME}   [ -d ${ALX_UNPRIV_HOME} ] && rm -rf ${ALX_UNPRIV_HOME}
    # Line 774  reset_system_settings() Line 771  reset_system_settings()
    771    
    772   # remove all old nics and modules configs   # remove all old nics and modules configs
    773   find /etc/conf.d -type f -name 'net.*' | xargs rm   find /etc/conf.d -type f -name 'net.*' | xargs rm
    774   find /etc/modules.d -type f -name 'net.*' | xargs rm   find /etc/modprobe.d -type f -name 'net.*' | xargs rm
    775    
    776   # restore default networking   # restore default networking
    777   cat ${ALX_SKELETONS}/net/net.eth0 > /etc/conf.d/net.eth0   cat ${ALX_SKELETONS}/net/net.eth0 > /etc/conf.d/net.eth0
    Legend:
    Removed from v.2121  
    changed lines
      Added in v.2122