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 2493 by niro, Wed Jan 8 12:27:04 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 107  mount_rootfs() Line 106  mount_rootfs()
    106   then   then
    107   echo $"${INSTALLROOT} already mounted" >&2   echo $"${INSTALLROOT} already mounted" >&2
    108   else   else
    109   mount "${ROOTHDD}" "${INSTALLROOT}" || dialog_die $"Could not mount rootfs - drive'${ROOTHDD}' -> '${INSTALLROOT}'"   mount "${ROOTHDD}" "${INSTALLROOT}" || dialog_die $"Could not mount rootfs - drive '${ROOTHDD}' -> '${INSTALLROOT}'"
    110   fi   fi
    111   [[ -d ${INSTALLROOT}/boot ]] || install -d ${INSTALLROOT}/boot   [[ -d ${INSTALLROOT}/boot ]] || install -d ${INSTALLROOT}/boot
    112  }  }
    # 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    
    # Line 310  install_system_settings() Line 309  install_system_settings()
    309   addconfig 'NETWORKING="dhcp"'   addconfig 'NETWORKING="dhcp"'
    310    
    311   # intel framebuffer quirk   # intel framebuffer quirk
    312   if [ -e ${INSTALLROOT}/etc/splash/splash.conf ]   CONFIG="${INSTALLROOT}/etc/splash/splash.conf"
    313     if [ -e ${CONFIG} ] && [ -e /proc/fb ]
    314   then   then
    315   if [ -e /proc/fb ]   if [[ ! -z $(grep 'inteldrmfb' /proc/fb) ]]
    316   then   then
    317   if [[ ! -z $(grep 'inteldrmfb' /proc/fb) ]]   fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:')
    318   then   [[ ${fbdev} != 0 ]] && sed -i "s:^\(SPLASH_DEV=\).*:\1\"/dev/fb${fbdev}\":" ${CONFIG} || dialog_die
      fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:')  
      if [[ ${fbdev} != 0 ]]  
      then  
      sed -i "s:^\(SPLASH_DEV=\).*:\1\"/dev/fb${fbdev}\":" ${INSTALLROOT}/etc/splash/splash.conf || dialog_die  
      fi  
      fi  
    319   fi   fi
    320   fi   fi
    321  }  }
    Legend:
    Removed from v.2493  
    changed lines
      Added in v.2642