Magellan Linux

  • Back to homepage
    • /[alx-svn]/alx-src/trunk/tinyalxconfig-ng/init.d/alxsettings

    Diff of /alx-src/trunk/tinyalxconfig-ng/init.d/alxsettings

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

    revision 489 by niro, Sun Jun 8 10:05:01 2008 UTC revision 490 by niro, Sun Jun 8 10:56:39 2008 UTC
    # Line 11  Line 11 
    11  #%before:  #%before:
    12  #%after:  #%after:
    13    
    14  # $Header: /home/cvsd/alx-cvs/alx-src/tinyalxconfig-ng/init.d/alxsettings,v 1.14 2008-06-08 10:05:01 niro Exp $  # $Header: /home/cvsd/alx-cvs/alx-src/tinyalxconfig-ng/init.d/alxsettings,v 1.15 2008-06-08 10:56:39 niro Exp $
    15    
    16  # checks first if the client was already configured and if it has an valid serial  # checks first if the client was already configured and if it has an valid serial
    17  # if not it runs the autoconfiguration script  # if not it runs the autoconfiguration script
    # Line 272  import_settings_to_db() Line 272  import_settings_to_db()
    272   # note: default_domain/hostname is set in config.rc   # note: default_domain/hostname is set in config.rc
    273    
    274   # to be safe, we do some sanity checks   # to be safe, we do some sanity checks
    275   [ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain   [[ -z ${ALX_DEFAULT_DOMAIN} ]] && ALX_DEFAULT_DOMAIN=localdomain
    276   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx   [[ -z ${ALX_DEFAULT_HOSTNAME} ]] && ALX_DEFAULT_HOSTNAME=magellan-alx
    277    
    278   # vars used by hwdetect   # vars used by hwdetect
    279   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME
    # Line 288  import_settings_to_db() Line 288  import_settings_to_db()
    288   echo -e ${COLMAGENTA}"Importing detected settings to database"${COLDEFAULT}   echo -e ${COLMAGENTA}"Importing detected settings to database"${COLDEFAULT}
    289    
    290   # network   # network
    291   echo -e "      Network settings ..."   echo "      Network settings ..."
    292   # global settings   # global settings
    293   mysqldo "insert into cfg_network(serial, hostname, domain )   mysqldo "insert into cfg_network(serial, hostname, domain )
    294   values('${ALX_SERIAL}', '${ALX_DEFAULT_HOSTNAME}','${ALX_DEFAULT_DOMAIN}');"   values('${ALX_SERIAL}', '${ALX_DEFAULT_HOSTNAME}','${ALX_DEFAULT_DOMAIN}');"
    # Line 317  import_settings_to_db() Line 317  import_settings_to_db()
    317   evaluate_retval   evaluate_retval
    318    
    319   # xserver   # xserver
    320   echo -e "      Graphic settings ..."   echo "      Graphic settings ..."
    321   # xserver general   # xserver general
    322   ( mysqldo "insert into cfg_graphic(   ( mysqldo "insert into cfg_graphic(
    323   serial,   serial,
    # Line 336  import_settings_to_db() Line 336  import_settings_to_db()
    336   evaluate_retval   evaluate_retval
    337    
    338   # input   # input
    339   echo -e "      Input settings ..."   echo "      Input settings ..."
    340   mysqldo "insert into cfg_input(serial,mouse,keyboard) values('${ALX_SERIAL}','${XMOUSETYPE}','kbd');"   mysqldo "insert into cfg_input(serial,mouse,keyboard) values('${ALX_SERIAL}','${XMOUSETYPE}','kbd');"
    341   evaluate_retval   evaluate_retval
    342    
    343   # auth   # auth
    344   echo -e "      Authentification settings ..."   echo "      Authentification settings ..."
    345   mysqldo "insert into client_auth(   mysqldo "insert into client_auth(
    346   serial,   serial,
    347   username,   username,
    # Line 362  import_settings_to_db() Line 362  import_settings_to_db()
    362    
    363   # exchange ssh rsa keys - the first boot needs this !   # exchange ssh rsa keys - the first boot needs this !
    364   # or no reboot will work via the webadmin   # or no reboot will work via the webadmin
    365   echo -e "      SSH authentification settings ..."   echo "      SSH authentification settings ..."
    366   HOME=/root config_ssh_auth   HOME=/root config_ssh_auth
    367   evaluate_retval   evaluate_retval
    368    
    369   # autostart   # autostart
    370   echo -e "      Autostart settings ..."   echo "      Autostart settings ..."
    371   mysqldo "insert into cfg_autostart(serial,session) values('${ALX_SERIAL}','');"   mysqldo "insert into cfg_autostart(serial,session) values('${ALX_SERIAL}','');"
    372    
    373   # screensaver   # screensaver
    374   echo -e "      Screensaver settings ..."   echo "      Screensaver settings ..."
    375   mysqldo "insert into cfg_screensaver(serial,screensaver) values('${ALX_SERIAL}','')"   mysqldo "insert into cfg_screensaver(serial,screensaver) values('${ALX_SERIAL}','')"
    376    
    377   evaluate_retval   evaluate_retval
    # Line 385  update_settings_in_db() Line 385  update_settings_in_db()
    385   # note: we updating only hardware settings here !   # note: we updating only hardware settings here !
    386    
    387   # to be safe, we do some sanity checks   # to be safe, we do some sanity checks
    388   [ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain   [[ -z ${ALX_DEFAULT_DOMAIN} ]] && ALX_DEFAULT_DOMAIN=localdomain
    389   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx   [[ -z ${ALX_DEFAULT_HOSTNAME} ]] && ALX_DEFAULT_HOSTNAME=magellan-alx
    390    
    391   # vars used by hwdetect   # vars used by hwdetect
    392   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME
    # Line 401  update_settings_in_db() Line 401  update_settings_in_db()
    401   echo -e ${COLMAGENTA}"Updating detected settings in database"${COLDEFAULT}   echo -e ${COLMAGENTA}"Updating detected settings in database"${COLDEFAULT}
    402    
    403   # network   # network
    404   echo -e "      Network settings ..."   echo "      Network settings ..."
    405   mysqldo "update cfg_network set   mysqldo "update cfg_network set
    406   hostname='${ALX_DEFAULT_HOSTNAME}',   hostname='${ALX_DEFAULT_HOSTNAME}',
    407   domain='${ALX_DEFAULT_DOMAIN}';   domain='${ALX_DEFAULT_DOMAIN}';
    # Line 427  update_settings_in_db() Line 427  update_settings_in_db()
    427   evaluate_retval   evaluate_retval
    428    
    429   # xserver   # xserver
    430   echo -e "      Graphic settings ..."   echo "      Graphic settings ..."
    431   # xserver general   # xserver general
    432   mysqldo "update cfg_graphic set   mysqldo "update cfg_graphic set
    433   module='${XMODULE}',   module='${XMODULE}',
    # Line 438  update_settings_in_db() Line 438  update_settings_in_db()
    438   evaluate_retval   evaluate_retval
    439    
    440   # input   # input
    441   echo -e "      Input settings ..."   echo "      Input settings ..."
    442   mysqldo "update cfg_input set mouse='${XMOUSETYPE}', keyboard='kbd' where serial=${ALX_SERIAL};"   mysqldo "update cfg_input set mouse='${XMOUSETYPE}', keyboard='kbd' where serial=${ALX_SERIAL};"
    443   evaluate_retval   evaluate_retval
    444  }  }
    # Line 451  import_settings_local() Line 451  import_settings_local()
    451   # note: default_domain/hostname is set in config.rc   # note: default_domain/hostname is set in config.rc
    452    
    453   # to be safe, we do some sanity checks   # to be safe, we do some sanity checks
    454   [ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain   [[ -z ${ALX_DEFAULT_DOMAIN} ]] && ALX_DEFAULT_DOMAIN=localdomain
    455   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx   [[ -z ${ALX_DEFAULT_HOSTNAME} ]] && ALX_DEFAULT_HOSTNAME=magellan-alx
    456    
    457   # vars used by hwdetect   # vars used by hwdetect
    458   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME
    # Line 478  import_settings_local() Line 478  import_settings_local()
    478   # now generate fluxbox config files   # now generate fluxbox config files
    479    
    480   # fluxbox main config   # fluxbox main config
    481   cat ${ALX_SKELETONS}/fluxbox/init \   cat ${ALX_SKELETONS}/fluxbox/init > ${ALX_UNPRIV_HOME}/.fluxbox/init
      > ${ALX_UNPRIV_HOME}/.fluxbox/init  
    482    
    483   # fluxbox autostart   # fluxbox autostart
    484   cat ${ALX_SKELETONS}/fluxbox/apps \   cat ${ALX_SKELETONS}/fluxbox/apps > ${ALX_UNPRIV_HOME}/.fluxbox/apps
      > ${ALX_UNPRIV_HOME}/.fluxbox/apps  
    485    
    486   # fluxbox menu header   # fluxbox menu header
    487   cat ${ALX_SKELETONS}/fluxbox/menu.header \   cat ${ALX_SKELETONS}/fluxbox/menu.header > ${ALX_UNPRIV_HOME}/.fluxbox/menu
      > ${ALX_UNPRIV_HOME}/.fluxbox/menu  
    488    
    489   # now fix it with proper messages :P   # now fix it with proper messages :P
    490   local ver="$(< /etc/mageversion)"   local ver="$(< /etc/mageversion)"
    491   sed -i "s:@CHANGEME@:alx-${ver}  #${ALX_SERIAL}:g" \   sed -i "s:@CHANGEME@:alx-${ver}  #${ALX_SERIAL}:g" ${ALX_UNPRIV_HOME}/.fluxbox/menu
      ${ALX_UNPRIV_HOME}/.fluxbox/menu  
    492    
    493   # add a newline (maybe there is no crlf in the header)   # add a newline (maybe there is no crlf in the header)
    494   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
    495    
    496   # fluxbox menu footer   # fluxbox menu footer
    497   cat ${ALX_SKELETONS}/fluxbox/menu.footer \   cat ${ALX_SKELETONS}/fluxbox/menu.footer >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
      >> ${ALX_UNPRIV_HOME}/.fluxbox/menu  
    498    
    499   # add a newline (maybe there is no crlf in the footer)   # add a newline (maybe there is no crlf in the footer)
    500   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
    # Line 680  case $1 in Line 675  case $1 in
    675   echo "Usage: $0 {start|stop} ..."   echo "Usage: $0 {start|stop} ..."
    676   ;;   ;;
    677  esac  esac
       
    Legend:
    Removed from v.489  
    changed lines
      Added in v.490