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 2500 by niro, Wed Jan 8 13:20:29 2014 UTC revision 2653 by niro, Thu Jul 3 08:01:05 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}"  LIVEROOT="${DEFAULT_LIVEROOT}"
    49    IMAGEROOT="${DEFAULT_IMAGEROOT}"
    50  INSTALLROOT="${DEFAULT_INSTALLROOT}"  INSTALLROOT="${DEFAULT_INSTALLROOT}"
    51  KERNELPKG="${DEFAULT_KERNELPKG}"  KERNELPKG="${DEFAULT_KERNELPKG}"
    52  KERNELOPTS="${DEFAULT_KERNELOPTS}"  KERNELOPTS="${DEFAULT_KERNELOPTS}"
    # Line 71  SPECIALDEVICE="" Line 57  SPECIALDEVICE=""
    57  FORMFACTOR="${DEFAULT_FORMFACTOR}"  FORMFACTOR="${DEFAULT_FORMFACTOR}"
    58  FORMAT_FILESYSTEM="${DEFAULT_FILESYSTEM}"  FORMAT_FILESYSTEM="${DEFAULT_FILESYSTEM}"
    59    
    60    # TOTALLINES=linecount of ${CDIMAGENAME}-tarball -1 !
    61    # -> now in images.conf
    62    CDIMAGENAME=""
    63    TOTALLINES=""
    64    CURRENTLINE=0
    65    if [ -e ${IMAGEROOT}/images.conf ]
    66    then
    67     source ${IMAGEROOT}/images.conf
    68     # check if all required variables are set
    69     [[ -z ${CDIMAGENAME} ]] && die "CDIMAGENAME is empty in ${IMAGEROOT}/images.conf"
    70     [[ -z ${TOTALLINES} ]] && die "TOTALLINES is empty in ${IMAGEROOT}/images.conf"
    71    else
    72     die "${IMAGEROOT}/images.conf not found"
    73    fi
    74    
    75  ### helper scripts ###  ### helper scripts ###
    76    
    # Line 188  run_hardware_detection_disks() Line 188  run_hardware_detection_disks()
    188   # all disks but exclude ramdisks   # all disks but exclude ramdisks
    189   export ALL_DISKS=$(get_hwinfo disk | sed '/\/dev\/ram[0-9].*/d')   export ALL_DISKS=$(get_hwinfo disk | sed '/\/dev\/ram[0-9].*/d')
    190   # remove the boot device from ALL_DISKS if it was an usbstick   # remove the boot device from ALL_DISKS if it was an usbstick
    191   if [[ $(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f3) != iso9660 ]]   if [[ $(grep '[[:space:]]${LIVEROOT}[[:space:]]' /proc/mounts | cut -d' ' -f3) != iso9660 ]]
    192   then   then
    193   bootdev="$(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f1 | sed 's:[0-9]::g')"   bootdev=$(grep "[[:space:]]${LIVEROOT}[[:space:]]" /proc/mounts | cut -d' ' -f1 | sed 's:[0-9]::g')
    194   export ALL_DISKS=$(echo "${ALL_DISKS}" | grep -v "${bootdev}")   export ALL_DISKS=$(echo "${ALL_DISKS}" | grep -v "${bootdev}")
    195   fi   fi
    196   export ALL_CDROMS="$(get_hwinfo cdrom)"   export ALL_CDROMS="$(get_hwinfo cdrom)"
    # Line 288  setup_hdd_format() Line 288  setup_hdd_format()
    288  install_system_image()  install_system_image()
    289  {  {
    290   pushd ${INSTALLROOT} > /dev/null   pushd ${INSTALLROOT} > /dev/null
    291   tar xvjpf ${CDROOT}/system/${CDIMAGENAME} -C ${INSTALLROOT}   tar xvjpf ${IMAGEROOT}}/${CDIMAGENAME} -C ${INSTALLROOT}
    292   popd > /dev/null   popd > /dev/null
    293  }  }
    294    
    Legend:
    Removed from v.2500  
    changed lines
      Added in v.2653