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 2641 by niro, Wed Jan 8 13:20:29 2014 UTC revision 2642 by niro, Wed Apr 2 11:28:21 2014 UTC
    # Line 40  do Line 40  do
    40   fi   fi
    41  done  done
    42    
     # TOTALLINES=linecount of ${CDIMAGENAME}-tarball -1 !  
     # -> now in images.conf  
     CDIMAGENAME=""  
     TOTALLINES=""  
     CURRENTLINE=0  
     if [ -e /mnt/cdrom/system/images.conf ]  
     then  
      source /mnt/cdrom/system/images.conf  
      # check if all required variables are set  
      [[ -z ${CDIMAGENAME} ]] && die "CDIMAGENAME is empty in /mnt/cdrom/system/images.conf"  
      [[ -z ${TOTALLINES} ]] && die "TOTALLINES is empty in /mnt/cdrom/system/images.conf"  
     else  
      die "/mnt/cdrom/system/images.conf not found"  
     fi  
       
    43  ### System/Config Version  ### System/Config Version
    44  VERSION="%VERSIONTAG%"  VERSION="%VERSIONTAG%"
    45  TITLE="${DEFAULT_TITLE} - ${VERSION}"  TITLE="${DEFAULT_TITLE} - ${VERSION}"
    46    
    47  # some sane defaults  # some sane defaults
    48  CDROOT="${DEFAULT_CDROOT}"  IMAGEROOT="${DEFAULT_IMAGEROOT}"
    49  INSTALLROOT="${DEFAULT_INSTALLROOT}"  INSTALLROOT="${DEFAULT_INSTALLROOT}"
    50  KERNELPKG="${DEFAULT_KERNELPKG}"  KERNELPKG="${DEFAULT_KERNELPKG}"
    51  KERNELOPTS="${DEFAULT_KERNELOPTS}"  KERNELOPTS="${DEFAULT_KERNELOPTS}"
    # Line 71  SPECIALDEVICE="" Line 56  SPECIALDEVICE=""
    56  FORMFACTOR="${DEFAULT_FORMFACTOR}"  FORMFACTOR="${DEFAULT_FORMFACTOR}"
    57  FORMAT_FILESYSTEM="${DEFAULT_FILESYSTEM}"  FORMAT_FILESYSTEM="${DEFAULT_FILESYSTEM}"
    58    
    59    # TOTALLINES=linecount of ${CDIMAGENAME}-tarball -1 !
    60    # -> now in images.conf
    61    CDIMAGENAME=""
    62    TOTALLINES=""
    63    CURRENTLINE=0
    64    if [ -e ${IMAGEROOT}/images.conf ]
    65    then
    66     source ${IMAGEROOT}/images.conf
    67     # check if all required variables are set
    68     [[ -z ${CDIMAGENAME} ]] && die "CDIMAGENAME is empty in ${IMAGEROOT}/images.conf"
    69     [[ -z ${TOTALLINES} ]] && die "TOTALLINES is empty in ${IMAGEROOT}/images.conf"
    70    else
    71     die "${IMAGEROOT}/images.conf not found"
    72    fi
    73    
    74  ### helper scripts ###  ### helper scripts ###
    75    
    # Line 288  setup_hdd_format() Line 287  setup_hdd_format()
    287  install_system_image()  install_system_image()
    288  {  {
    289   pushd ${INSTALLROOT} > /dev/null   pushd ${INSTALLROOT} > /dev/null
    290   tar xvjpf ${CDROOT}/system/${CDIMAGENAME} -C ${INSTALLROOT}   tar xvjpf ${IMAGEROOT}}/${CDIMAGENAME} -C ${INSTALLROOT}
    291   popd > /dev/null   popd > /dev/null
    292  }  }
    293    
    Legend:
    Removed from v.2641  
    changed lines
      Added in v.2642