Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/installer/gtk-gui/networking.sh

    Diff of /trunk/installer/gtk-gui/networking.sh

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

    revision 762 by niro, Mon Sep 22 21:13:13 2008 UTC revision 1011 by niro, Sun May 30 17:32:56 2010 UTC
    # Line 1  Line 1 
    1  # $Header: /home/cvsd/magellan-cvs/magellan-src/installer/gtk-gui/networking.sh,v 1.2 2008-09-22 21:13:13 niro Exp $  # $Id$
    2    
    3  export NETWORK_CONFIG='  export NETWORK_CONFIG='
    4  <window title="Network Configuration" icon-name="gtk-network" window_position="1">  <window title="Network Configuration" icon-name="gtk-network" window_position="1">
    5   <vbox>   <vbox>
    6   <pixmap>   <pixmap>
    7   <input file>header.png</input>   <input file>data/header.png</input>
    8   </pixmap>   </pixmap>
    9   <hbox spacing="175">   <hbox spacing="175">
    10   <pixmap>   <pixmap>
    # Line 44  export NETWORK_CONFIG_SELECT=' Line 44  export NETWORK_CONFIG_SELECT='
    44  <window title="Network Configuration" icon-name="gtk-network" window_position="1" resizable="false">  <window title="Network Configuration" icon-name="gtk-network" window_position="1" resizable="false">
    45   <vbox>   <vbox>
    46   <pixmap>   <pixmap>
    47   <input file>header.png</input>   <input file>data/header.png</input>
    48   </pixmap>   </pixmap>
    49   <hbox>   <hbox>
    50   <pixmap>   <pixmap>
    # Line 88  export NETWORK_CONFIG_STATIC=' Line 88  export NETWORK_CONFIG_STATIC='
    88  <window title="Network Configuration" icon-name="gtk-network" window_position="1" resizable="false">  <window title="Network Configuration" icon-name="gtk-network" window_position="1" resizable="false">
    89   <vbox>   <vbox>
    90   <pixmap>   <pixmap>
    91   <input file>header.png</input>   <input file>data/header.png</input>
    92   </pixmap>   </pixmap>
    93   <hbox spacing="140">   <hbox spacing="140">
    94   <pixmap>   <pixmap>
    # Line 117  export NETWORK_CONFIG_STATIC=' Line 117  export NETWORK_CONFIG_STATIC='
    117   </entry>   </entry>
    118    
    119   <text xalign="0">   <text xalign="0">
    120     <label>Broadcast</label>
    121     </text>
    122     <entry>
    123     <input>echo "${NETWORK_BROADCAST}"</input>
    124     <variable>NETWORK_BROADCAST</variable>
    125     </entry>
    126    
    127     <text xalign="0">
    128   <label>Gateway</label>   <label>Gateway</label>
    129   </text>   </text>
    130   <entry>   <entry>
    # Line 150  export NETWORK_SELECT_NIC=' Line 158  export NETWORK_SELECT_NIC='
    158  <window title="Network Configuration" icon-name="gtk-network" window_position="1" resizable="false">  <window title="Network Configuration" icon-name="gtk-network" window_position="1" resizable="false">
    159   <vbox>   <vbox>
    160   <pixmap>   <pixmap>
    161   <input file>header.png</input>   <input file>data/header.png</input>
    162   </pixmap>   </pixmap>
    163   <hbox spacing="140">   <hbox spacing="140">
    164   <pixmap>   <pixmap>
    # Line 164  export NETWORK_SELECT_NIC=' Line 172  export NETWORK_SELECT_NIC='
    172   <frame Available NICs>   <frame Available NICs>
    173   <table>   <table>
    174   <label>Interface|Description</label>   <label>Interface|Description</label>
    175   <input>source hwdetection.sh; get_hwinfo -d netcard | sed "s:;:\|:g"</input>   <input>source include/hwdetection.sh; get_hwinfo -d netcard | sed "s:;:\|:g"</input>
    176   <variable>NETWORK_NIC</variable>   <variable>NETWORK_NIC</variable>
    177   </table>   </table>
    178   </frame>   </frame>
    # Line 198  check_static_network_config() Line 206  check_static_network_config()
    206   return 1   return 1
    207   fi   fi
    208    
    209     if [[ -z ${NETWORK_BROADCAST} ]]
    210     then
    211     FAILURE_MESSAGE="No broadcast given!" rundialog FAILURE_DIALOG
    212     return 1
    213     fi
    214    
    215   return 0   return 0
    216  }  }
    217  # needed to be available in the gtk-dialog  # needed to be available in the gtk-dialog
    # Line 207  export -f check_static_network_config Line 221  export -f check_static_network_config
    221  rundialog_network_config()  rundialog_network_config()
    222  {  {
    223   rundialog NETWORK_CONFIG   rundialog NETWORK_CONFIG
    224   echo "DEBUG: EXIT='${EXIT}'"   debug "EXIT='${EXIT}'"
    225    
    226   # save given variables in env   # save given variables in env
    227   # they will be shown as default on error   # they will be shown as default on error
    # Line 242  rundialog_network_config() Line 256  rundialog_network_config()
    256  rundialog_network_config_select()  rundialog_network_config_select()
    257  {  {
    258   rundialog NETWORK_CONFIG_SELECT   rundialog NETWORK_CONFIG_SELECT
    259   echo "DEBUG: EXIT='${EXIT}'"   debug "EXIT='${EXIT}'"
    260    
    261   echo "DEBUG: NETWORK_DHCP='${NETWORK_DHCP}'"   debug "NETWORK_DHCP='${NETWORK_DHCP}'"
    262   echo "DEBUG: NETWORK_STATIC='${NETWORK_STATIC}'"   debug "NETWORK_STATIC='${NETWORK_STATIC}'"
    263   echo "DEBUG: NETWORK_NONE='${NETWORK_NONE}'"   debug "NETWORK_NONE='${NETWORK_NONE}'"
    264    
    265   case ${EXIT} in   case ${EXIT} in
    266   abort)   abort)
    # Line 285  rundialog_network_config_select() Line 299  rundialog_network_config_select()
    299  rundialog_network_config_static()  rundialog_network_config_static()
    300  {  {
    301   rundialog NETWORK_CONFIG_STATIC   rundialog NETWORK_CONFIG_STATIC
    302   echo "DEBUG: EXIT='${EXIT}'"   debug "EXIT='${EXIT}'"
    303    
    304   # save given variables in env   # save given variables in env
    305   # they will be shown as default on error   # they will be shown as default on error
    # Line 293  rundialog_network_config_static() Line 307  rundialog_network_config_static()
    307   export NETWORK_NETMASK   export NETWORK_NETMASK
    308   export NETWORK_GATEWAY   export NETWORK_GATEWAY
    309   export NETWORK_NAMESERVER   export NETWORK_NAMESERVER
    310     export NETWORK_BROADCAST
    311    
    312   case ${EXIT} in   case ${EXIT} in
    313   abort)   abort)
    # Line 315  rundialog_network_config_static() Line 330  rundialog_network_config_static()
    330  rundialog_network_select_nic()  rundialog_network_select_nic()
    331  {  {
    332   rundialog NETWORK_SELECT_NIC   rundialog NETWORK_SELECT_NIC
    333   echo "DEBUG: EXIT='${EXIT}'"   debug "EXIT='${EXIT}'"
    334    
    335   case ${EXIT} in   case ${EXIT} in
    336   abort)   abort)
    # Line 350  main_networking() Line 365  main_networking()
    365   export NETWORK_METHOD   export NETWORK_METHOD
    366   export NETWORK_IP   export NETWORK_IP
    367   export NETWORK_NETMASK   export NETWORK_NETMASK
    368     export NETWORK_BROADCAST
    369   export NETWORK_GATEWAY   export NETWORK_GATEWAY
    370   export NETWORK_NAMESERVER   export NETWORK_NAMESERVER
    371  }  }
    Legend:
    Removed from v.762  
    changed lines
      Added in v.1011