Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/installer-simple/bin/installer.sh.in

    Diff of /trunk/installer-simple/bin/installer.sh.in

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

    revision 2339 by niro, Fri Jan 3 14:20:42 2014 UTC revision 2341 by niro, Fri Jan 3 14:38:46 2014 UTC
    # Line 9  Line 9 
    9    
    10  # ignore the environment  # ignore the environment
    11  LC_ALL=C  LC_ALL=C
    12    # include dir
    13  INSTALLER_LIBDIR="%LIBDIR%"  INSTALLER_LIBDIR="%LIBDIR%"
    14    
    15    # TOTALLINES=linecount of ${CDIMAGENAME}-tarball -1 !
    16    # -> now in images.conf
    17    CURRENTLINE=0
    18    
    19  # configuration  # configuration
    20  if [ -e %SYSCONFDIR%/installer.conf ]  if [ -e %SYSCONFDIR%/installer.conf ]
    21  then  then
    # Line 20  else Line 24  else
    24   die "/etc/installer.conf not found"   die "/etc/installer.conf not found"
    25  fi  fi
    26    
    27  #images: (get ${CDIMAGENAME})  # TOTALLINES=linecount of ${CDIMAGENAME}-tarball -1 !
    28    # -> now in images.conf
    29    CDIMAGENAME=""
    30    TOTALLINES=""
    31    CURRENTLINE=0
    32  if [ -e /mnt/cdrom/system/images.conf ]  if [ -e /mnt/cdrom/system/images.conf ]
    33  then  then
    34   source /mnt/cdrom/system/images.conf   source /mnt/cdrom/system/images.conf
    35     # check if all required variables are set
    36     [[ -z ${CDIMAGENAME} ]] && die "CDIMAGENAME is empty in /mnt/cdrom/system/images.conf"
    37     [[ -z ${TOTALLINES} ]] && die "TOTALLINES is empty in /mnt/cdrom/system/images.conf"
    38  else  else
    39   die "/mnt/cdrom/system/images.conf not found"   die "/mnt/cdrom/system/images.conf not found"
    40  fi  fi
    # Line 38  TITLE="${DEFAULT_TITLE} - ${VERSION}" Line 49  TITLE="${DEFAULT_TITLE} - ${VERSION}"
    49  CDPATH="${DEFAULT_CDPATH}"  CDPATH="${DEFAULT_CDPATH}"
    50  INSTALLPATH="${DEFAULT_INSTALLPATH}"  INSTALLPATH="${DEFAULT_INSTALLPATH}"
    51    
     ### WICHTIG: anzahl lines in der autosta_lx.tar.gz -1  
     CURRENTLINE=0  
     #TOTALLINES=11072 # -> now in images.conf  
       
    52  # standard kernel opts  # standard kernel opts
    53  KERNELOPTS="quiet video=1024x768"  KERNELOPTS="quiet video=1024x768"
    54    
    # Line 71  die() Line 78  die()
    78    
    79  dialog_die()  dialog_die()
    80  {  {
    81   ERROR=$1   ERROR="$1"
    82   RETVAL=$?   RETVAL="$?"
    83   dialog_install_failure   dialog_install_failure
    84   exit 1   exit 1
    85  }  }
    # Line 161  dialog_setup_system_menu() Line 168  dialog_setup_system_menu()
    168   then   then
    169   case "${i}" in   case "${i}" in
    170   "1") run_install_auto ;;   "1") run_install_auto ;;
    171           "2") run_install_normal ;;   "2") run_install_normal ;;
    172   "3") run_install_flash ;;   "3") run_install_flash ;;
    173   "") dialog_setup_system_menu;;   "") dialog_setup_system_menu;;
    174   esac   esac
    # Line 448  dialog_main() Line 455  dialog_main()
    455   if [[ ${RES} -eq 0 ]]   if [[ ${RES} -eq 0 ]]
    456   then   then
    457   case ${METHOD} in   case ${METHOD} in
    458           "1") dialog_setup_system_menu ;;   "1") dialog_setup_system_menu ;;
    459   "2") dialog_hardware_detection ;;   "2") dialog_hardware_detection ;;
    460   "3") install_do_reboot ;;   "3") install_do_reboot ;;
    461   "4") /bin/bash --login -i ;;   "4") /bin/bash --login -i ;;
    Legend:
    Removed from v.2339  
    changed lines
      Added in v.2341