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 2489 by niro, Wed Jan 8 12:14:37 2014 UTC revision 2654 by niro, Thu Jul 3 08:24:39 2014 UTC
    # Line 9  Line 9 
    9    
    10  # setup locales  # setup locales
    11  TEXTDOMAIN=installer  TEXTDOMAIN=installer
     LC_MESSAGES=C  
    12    
    13  # include dir  # include dir
    14  INSTALLER_LIBDIR="%LIBDIR%"  INSTALLER_LIBDIR="%LIBDIR%"
    # Line 41  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 72  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 108  mount_rootfs() Line 107  mount_rootfs()
    107   then   then
    108   echo $"${INSTALLROOT} already mounted" >&2   echo $"${INSTALLROOT} already mounted" >&2
    109   else   else
    110   mount "${ROOTHDD}" "${INSTALLROOT}" || dialog_die $"Could not mount rootfs - drive'${ROOTHDD}' -> '${INSTALLROOT}'"   mount "${ROOTHDD}" "${INSTALLROOT}" || dialog_die $"Could not mount rootfs - drive '${ROOTHDD}' -> '${INSTALLROOT}'"
    111   fi   fi
    112   [[ -d ${INSTALLROOT}/boot ]] || install -d ${INSTALLROOT}/boot   [[ -d ${INSTALLROOT}/boot ]] || install -d ${INSTALLROOT}/boot
    113  }  }
    # Line 130  run_hardware_detection() Line 129  run_hardware_detection()
    129    
    130   hwinfo="$(hwinfo --bios --storage --pci --gfxcard --sys)"   hwinfo="$(hwinfo --bios --storage --pci --gfxcard --sys)"
    131    
    132   ## check for special devices/clients:   # check for special devices/clients:
    133   ## if zotac a zotac and the disk is a removeable device, then add rootdelay to kernelcmd   # if zotac a zotac and the disk is a removeable device, then add rootdelay to kernelcmd
    134   #local removable=0   local removable=0
    135   #if [[ ! -z $(echo "${hwinfo}" | grep -i zotac) ]]   if [[ ! -z $(echo "${hwinfo}" | grep -i zotac) ]]
    136   #then   then
    137   #for i in /sys/block/[hs]d*/removable   #for i in /sys/block/[hs]d*/removable
    138   #do   #do
    139   #if [[ $(< ${i}) = 1 ]]   # if [[ $(< ${i}) = 1 ]]
    140   #then   # then
    141   #removable=1   # removable=1
    142   #fi   # fi
    143   #done   #done
    144   ## smartcard = udevadm info -n /dev/sda -a | grep -i 'configuration.*card'   # smartcard = udevadm info -n /dev/sda -a | grep -i 'configuration.*card'
    145    
    146   ## only add this for grub legacy, grub2 detect these settings on its own   # only add this for grub legacy, grub2 detect these settings on its own
    147   #export GRUBLEGACYOPTS="rootdelay=8"   export GRUBLEGACYOPTS="rootdelay=8"
    148   ## there are to zotac types in the wild, nvidia based gfx and intel   # there are to zotac types in the wild, nvidia based gfx and intel
    149   #if [[ ! -z $(echo "${hwinfo}" | grep -i nouveau) ]]   if [[ ! -z $(echo "${hwinfo}" | grep -i nouveau) ]]
    150   #then   then
    151   #export SPECIALDEVICE="zotac_nvidia"   export SPECIALDEVICE="zotac_nvidia"
    152   #else   else
    153   #export SPECIALDEVICE="zotac_intel"   export SPECIALDEVICE="zotac_intel"
    154   #fi   fi
    155   #fi   fi
    156    
    157   # check for special devices/clients:   # check for special devices/clients:
    158   # if a rangee and disk ist smaller then 256mb move partion one block further ahead   # if a rangee and disk ist smaller then 256mb move partion one block further ahead
    # Line 189  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 211  setup_hdd_partitions_auto() Line 210  setup_hdd_partitions_auto()
    210   # run this only if FDISKPARTITIONBELOW256MB is not already 1   # run this only if FDISKPARTITIONBELOW256MB is not already 1
    211   if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]   if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]
    212   then   then
    213   if hdd_size_below_256mb ${HDD}   if device_minimum_size "${HDD}" 256
    214   then   then
    215   FDISKPARTIONBELOW256MB=1   FDISKPARTIONBELOW256MB=1
    216   else   else
    # Line 289  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    
    # Line 311  install_system_settings() Line 310  install_system_settings()
    310   addconfig 'NETWORKING="dhcp"'   addconfig 'NETWORKING="dhcp"'
    311    
    312   # intel framebuffer quirk   # intel framebuffer quirk
    313   if [ -e ${INSTALLROOT}/etc/splash/splash.conf ]   CONFIG="${INSTALLROOT}/etc/splash/splash.conf"
    314     if [ -e ${CONFIG} ] && [ -e /proc/fb ]
    315   then   then
    316   if [ -e /proc/fb ]   if [[ ! -z $(grep 'inteldrmfb' /proc/fb) ]]
    317   then   then
    318   if [[ ! -z $(grep 'inteldrmfb' /proc/fb) ]]   fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:')
    319   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  
    320   fi   fi
    321   fi   fi
    322  }  }
    Legend:
    Removed from v.2489  
    changed lines
      Added in v.2654