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 2642 by niro, Wed Apr 2 11:28:21 2014 UTC revision 2655 by niro, Thu Jul 3 08:33:54 2014 UTC
    # Line 45  VERSION="%VERSIONTAG%" Line 45  VERSION="%VERSIONTAG%"
    45  TITLE="${DEFAULT_TITLE} - ${VERSION}"  TITLE="${DEFAULT_TITLE} - ${VERSION}"
    46    
    47  # some sane defaults  # some sane defaults
    48    LIVEROOT="${DEFAULT_LIVEROOT}"
    49  IMAGEROOT="${DEFAULT_IMAGEROOT}"  IMAGEROOT="${DEFAULT_IMAGEROOT}"
    50  INSTALLROOT="${DEFAULT_INSTALLROOT}"  INSTALLROOT="${DEFAULT_INSTALLROOT}"
    51  KERNELPKG="${DEFAULT_KERNELPKG}"  KERNELPKG="${DEFAULT_KERNELPKG}"
    # Line 128  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 187  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 287  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 ${IMAGEROOT}}/${CDIMAGENAME} -C ${INSTALLROOT}   tar xvjpf ${IMAGEROOT}/${CDIMAGENAME} -C ${INSTALLROOT}
    292   popd > /dev/null   popd > /dev/null
    293  }  }
    294    
    Legend:
    Removed from v.2642  
    changed lines
      Added in v.2655