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 2424 by niro, Tue Jan 7 13:56:51 2014 UTC revision 2433 by niro, Tue Jan 7 14:18:40 2014 UTC
    # Line 27  for inc in %SYSCONFDIR%/installer.conf \ Line 27  for inc in %SYSCONFDIR%/installer.conf \
    27   ${INSTALLER_LIBDIR}/functions/common.sh \   ${INSTALLER_LIBDIR}/functions/common.sh \
    28   ${INSTALLER_LIBDIR}/functions/common-dialogs.sh \   ${INSTALLER_LIBDIR}/functions/common-dialogs.sh \
    29   ${INSTALLER_LIBDIR}/functions/hwdetection.sh \   ${INSTALLER_LIBDIR}/functions/hwdetection.sh \
    30     ${INSTALLER_LIBDIR}/functions/bootloader.sh \
    31     ${INSTALLER_LIBDIR}/functions/initrd-tools.sh \
    32   ${INSTALLER_LIBDIR}/functions/installer-dialogs.sh   ${INSTALLER_LIBDIR}/functions/installer-dialogs.sh
    33  do  do
    34   if [ -e ${inc} ]   if [ -e ${inc} ]
    # Line 231  dialog_setup_hdd_partitions_auto() Line 233  dialog_setup_hdd_partitions_auto()
    233   fi   fi
    234  }  }
    235    
     run_hardware_detection_disks()  
     {  
      local bootdev  
       
      # all disks but exclude ramdisks  
      export ALL_DISKS=$(get_hwinfo disk | sed '/\/dev\/ram[0-9].*/d')  
      # remove the boot device from ALL_DISKS if it was an usbstick  
      if [[ $(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f3) != iso9660 ]]  
      then  
      bootdev="$(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f1 | sed 's:[0-9]::g')"  
      export ALL_DISKS=$(echo "${ALL_DISKS}" | grep -v "${bootdev}")  
      fi  
      export ALL_CDROMS="$(get_hwinfo cdrom)"  
     }  
       
     dialog_setup_hdd_create_partitions()  
     {  
      dialog \  
      --backtitle "${TITLE}" \  
      --infobox "Erstelle Disk Partitionen ..." 3 70  
     }  
       
     dialog_setup_hdd_format()  
     {  
      dialog \  
      --backtitle "${TITLE}" \  
      --infobox "Erstelle Datei-Systeme ..." 3 70  
     }  
       
     dialog_install_settings()  
     {  
      dialog \  
      --backtitle "${TITLE}" \  
      --infobox "Speichere System-Einstellungen ..." 3 70  
     }  
       
     dialog_install_system_image()  
     {  
      dialog \  
      --backtitle "${TITLE}" \  
      --gauge "Kopiere System-Image ..." 6 80  
     }  
       
    236  install_meter()  install_meter()
    237  {  {
    238   while [[ ${CURRENTLINE} != ${TOTALLINES} ]]   while [[ ${CURRENTLINE} != ${TOTALLINES} ]]
    # Line 287  install_meter() Line 246  install_meter()
    246   return 0   return 0
    247  }  }
    248    
       
     dialog_install_bootsector()  
     {  
      dialog \  
      --backtitle "${TITLE}" \  
      --infobox "Schreibe den Bootsektor ..." 3 70  
     }  
       
     dialog_install_successful()  
     {  
      dialog \  
      --backtitle "${TITLE}" \  
      --colors \  
      --msgbox "Die Installation war \Z2erfolgreich\Zn." 5 81  
     }  
       
     dialog_install_failure()  
     {  
      dialog \  
      --backtitle "${TITLE}" \  
      --colors \  
      --msgbox "Die Installation ist \Z1Fehlgeschlagen\Zn.\n\n\  
      Fehler bei ${ERROR}, RetVal: ${RETVAL} \  
      " 10 81  
     }  
       
    249  dialog_main()  dialog_main()
    250  {  {
    251   local method=0   local method=0
    # Line 320  dialog_main() Line 253  dialog_main()
    253    
    254   while [[ ${method} -le 2 ]]   while [[ ${method} -le 2 ]]
    255   do   do
    256   method=$(dialog \   method=$(menubox $"Configuration:" \
    257   --backtitle "${TITLE}" \   $"1:Install system" \
    258   --no-cancel \   $"2:Show detected harddrives" \
    259   --ok-label "Weiter" \   $"3:Exit and reboot" \
    260   --stdout \   $"4:Exit and drop into a shell")
      --menu "Konfiguration" 14 70 5 \  
      "1" "AutoSta_LX installieren" \  
      "2" "Uebersicht gefundener Laufwerke" \  
      "3" "Beenden und neustarten" \  
      "4" "Beenden und eine Shell starten")  
    261   retval=$?   retval=$?
    262   [[ ${retval} -eq 1 ]] && exit 1   [[ ${retval} -eq 1 ]] && exit 1
    263   if [[ ${retval} -eq 0 ]]   if [[ ${retval} -eq 0 ]]
    # Line 353  run_hardware_detection() Line 281  run_hardware_detection()
    281    
    282   hwinfo="$(hwinfo --bios --storage --pci --gfxcard --sys)"   hwinfo="$(hwinfo --bios --storage --pci --gfxcard --sys)"
    283    
    284   # check for special devices/clients:   ## check for special devices/clients:
    285   # 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
    286   local removable=0   #local removable=0
    287   if [[ ! -z $(echo "${hwinfo}" | grep -i zotac) ]]   #if [[ ! -z $(echo "${hwinfo}" | grep -i zotac) ]]
    288   then   #then
    289   for i in /sys/block/[hs]d*/removable   #for i in /sys/block/[hs]d*/removable
    290   do   #do
    291   if [[ $(< ${i}) = 1 ]]   #if [[ $(< ${i}) = 1 ]]
    292   then   #then
    293   removable=1   #removable=1
    294   fi   #fi
    295   done   #done
    296     ## smartcard = udevadm info -n /dev/sda -a | grep -i 'configuration.*card'
    297   # only add this for grub legacy, grub2 detect these settings on its own  
    298   export GRUBLEGACYOPTS="rootdelay=8"   ## only add this for grub legacy, grub2 detect these settings on its own
    299   # there are to zotac types in the wild, nvidia based gfx and intel   #export GRUBLEGACYOPTS="rootdelay=8"
    300   if [[ ! -z $(echo "${hwinfo}" | grep -i nouveau) ]]   ## there are to zotac types in the wild, nvidia based gfx and intel
    301   then   #if [[ ! -z $(echo "${hwinfo}" | grep -i nouveau) ]]
    302   export SPECIALDEVICE="zotac_nvidia"   #then
    303   else   #export SPECIALDEVICE="zotac_nvidia"
    304   export SPECIALDEVICE="zotac_intel"   #else
    305   fi   #export SPECIALDEVICE="zotac_intel"
    306   fi   #fi
    307     #fi
    308    
    309   # check for special devices/clients:   # check for special devices/clients:
    310   # 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 404  run_hardware_detection() Line 333  run_hardware_detection()
    333   fi   fi
    334  }  }
    335    
    336    run_hardware_detection_disks()
    337    {
    338     local bootdev
    339    
    340     # all disks but exclude ramdisks
    341     export ALL_DISKS=$(get_hwinfo disk | sed '/\/dev\/ram[0-9].*/d')
    342     # remove the boot device from ALL_DISKS if it was an usbstick
    343     if [[ $(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f3) != iso9660 ]]
    344     then
    345     bootdev="$(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f1 | sed 's:[0-9]::g')"
    346     export ALL_DISKS=$(echo "${ALL_DISKS}" | grep -v "${bootdev}")
    347     fi
    348     export ALL_CDROMS="$(get_hwinfo cdrom)"
    349    }
    350    
    351  hdd_size_below_256mb()  hdd_size_below_256mb()
    352  {  {
    353   local hdd="$1"   local hdd="$1"
    # Line 494  setup_hdd_partitions_manual() Line 438  setup_hdd_partitions_manual()
    438    
    439  setup_hdd_format()  setup_hdd_format()
    440  {  {
    441   mke2fs -j -q ${ROOTHDD} || dialog_die   mkfs."${FORMAT_FILESYSTEM}" -q "${ROOTHDD}" || dialog_die
    442  }  }
    443    
    444  install_mount_rootfs()  install_mount_rootfs()
    # Line 506  install_mount_rootfs() Line 450  install_mount_rootfs()
    450    
    451  install_system_image()  install_system_image()
    452  {  {
    453     pushd ${INSTALLROOT} > /dev/null
    454   tar xvjpf ${CDROOT}/system/${CDIMAGENAME} -C ${INSTALLROOT}   tar xvjpf ${CDROOT}/system/${CDIMAGENAME} -C ${INSTALLROOT}
    455     popd > /dev/null
    456  }  }
    457    
    458  install_bootsector_chroot()  install_bootsector_chroot()
    # Line 747  install_system_settings() Line 693  install_system_settings()
    693    
    694  install_umount_rootfs()  install_umount_rootfs()
    695  {  {
      cd /  
    696   umount ${INSTALLROOT}/boot || dialog_die   umount ${INSTALLROOT}/boot || dialog_die
    697   umount ${INSTALLROOT} || dialog_die   umount ${INSTALLROOT} || dialog_die
    698  }  }
    # Line 774  run_install_normal() Line 719  run_install_normal()
    719   dialog_install_settings   dialog_install_settings
    720   sleep 1   sleep 1
    721   install_system_settings   install_system_settings
    722     dialog_install_initrd
    723   install_initrd_chroot   install_initrd_chroot
    724    
    725   dialog_install_bootsector   dialog_install_bootsector
    # Line 796  run_install_auto() Line 742  run_install_auto()
    742   dialog_install_settings   dialog_install_settings
    743   sleep 1   sleep 1
    744   install_system_settings   install_system_settings
    745     dialog_install_initrd
    746   install_initrd_chroot   install_initrd_chroot
    747    
    748   dialog_install_bootsector   dialog_install_bootsector
    Legend:
    Removed from v.2424  
    changed lines
      Added in v.2433