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 2398 by niro, Tue Jan 7 13:06:55 2014 UTC revision 2399 by niro, Tue Jan 7 13:13:26 2014 UTC
    # Line 100  dialog_warning() Line 100  dialog_warning()
    100    
    101  dialog_setup_hdd_info()  dialog_setup_hdd_info()
    102  {  {
      local SHDD="$(echo ${HDD} | sed 's/\/dev\///')"  
       
      dialog \  
      --colors \  
      --title "[ Festplatten Partitionierung ]" \  
      --backtitle "${TITLE}" \  
      --ok-label "Weiter" \  
      --msgbox "\nBitte legen Sie 3 Partitionen an.\n\n\  
      [ \Z3${SHDD}1\Zn ] Typ: \Z3Linux\Zn mit ca. 50MB\n\  
      [ \Z3${SHDD}2\Zn ] Typ: \Z3Linux Swap\Zn mit ca. 256MB\n\  
      [ \Z3${SHDD}3\Zn ] Typ: \Z3Linux \Zn mit dem Rest (min. 256MB)\n\n\  
      Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81  
     }  
       
     dialog_setup_hdd_info_flash()  
     {  
    103   local SHDD="$(echo $HDD | sed 's/\/dev\///')"   local SHDD="$(echo $HDD | sed 's/\/dev\///')"
    104    
    105   dialog \   dialog \
    # Line 157  dialog_setup_system_menu() Line 141  dialog_setup_system_menu()
    141   "" "" \   "" "" \
    142   "" "\Z1Experten Modi:\Zn" \   "" "\Z1Experten Modi:\Zn" \
    143   "2" "Normale IDE-Disk (Manuell)" \   "2" "Normale IDE-Disk (Manuell)" \
      "3" "Flash-Speicher (Manuell)")  
    144   RES=$?   RES=$?
    145   [[ ${RES} -eq 1 ]] && return 1   [[ ${RES} -eq 1 ]] && return 1
    146   if [[ ${RES} -eq 0 ]]   if [[ ${RES} -eq 0 ]]
    # Line 165  dialog_setup_system_menu() Line 148  dialog_setup_system_menu()
    148   case "${i}" in   case "${i}" in
    149   "1") run_install_auto ;;   "1") run_install_auto ;;
    150   "2") run_install_normal ;;   "2") run_install_normal ;;
      "3") run_install_flash ;;  
    151   "") dialog_setup_system_menu;;   "") dialog_setup_system_menu;;
    152   esac   esac
    153   fi   fi
    # Line 273  dialog_setup_hdd_partitions_manuell() Line 255  dialog_setup_hdd_partitions_manuell()
    255   fi   fi
    256  }  }
    257    
     dialog_setup_hdd_partitions_manuell_flash()  
     {  
      local i  
       
      if [[ -z ${installdevs} ]]  
      then  
      dialog \  
      --backtitle "${TITLE}" \  
      --ok-label "Beenden" \  
      --msgbox "Kein geeignetes Laufwerk gefunden.\nDie Installation ist fehlgeschlagen." 6 70  
      exit 1  
      else  
       
      echo "dialog \\" > /tmp/hddtmp.sh  
      echo "--backtitle \"${TITLE}\" \\" >> /tmp/hddtmp.sh  
      echo "--ok-label \"Weiter\" \\" >> /tmp/hddtmp.sh  
      echo "--cancel-label \"Beenden\" \\" >> /tmp/hddtmp.sh  
      echo "--stdout \\" >> /tmp/hddtmp.sh  
      echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh  
       
      for i in ${installdevs}  
      do  
      echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh  
      done  
      echo -e "\n" >> /tmp/hddtmp.sh  
       
      chmod a+x /tmp/hddtmp.sh  
      HDD="$(/tmp/hddtmp.sh)"  
      RES=$?  
      [[ ${RES} -eq 1 ]] && return 1  
      if [[ ${RES} -eq 0 ]]  
      then  
      dialog_setup_hdd_info_flash  
      setup_hdd_partitions_manuell_flash  
      fi  
      fi  
     }  
       
    258  dialog_setup_hdd_partitions_auto()  dialog_setup_hdd_partitions_auto()
    259  {  {
    260   local i   local i
    # Line 604  EOF Line 548  EOF
    548    
    549  setup_hdd_partitions_manuell()  setup_hdd_partitions_manuell()
    550  {  {
      BOOTHDD="${HDD}1"  
      SWAPHDD="${HDD}2"  
      ROOTHDD="${HDD}3"  
       
      ## hdds partitionieren manuell  
      cfdisk ${HDD} || dialog_die  
     }  
       
     setup_hdd_partitions_manuell_flash()  
     {  
    551   ROOTHDD="${HDD}1"   ROOTHDD="${HDD}1"
    552    
    553   ## hdds partitionieren manuell   ## hdds partitionieren manuell
    # Line 622  setup_hdd_partitions_manuell_flash() Line 556  setup_hdd_partitions_manuell_flash()
    556    
    557  setup_hdd_format()  setup_hdd_format()
    558  {  {
      mkswap ${SWAPHDD} || dialog_die  
      mke2fs -j -q ${BOOTHDD} || dialog_die  
      mke2fs -j -q ${ROOTHDD} || dialog_die  
     }  
       
     setup_hdd_format_flash()  
     {  
    559   mke2fs -j -q ${ROOTHDD} || dialog_die   mke2fs -j -q ${ROOTHDD} || dialog_die
    560  }  }
    561    
    562  install_mount_rootfs()  install_mount_rootfs()
    563  {  {
      swapon ${SWAPHDD} || dialog_die  
      mount ${ROOTHDD} ${INSTALLROOT} || dialog_die  
      install -d ${INSTALLROOT}/boot || dialog_die  
      mount ${BOOTHDD} ${INSTALLROOT}/boot || dialog_die  
      cd ${INSTALLROOT} || dialog_die  
     }  
       
     install_mount_rootfs_flash()  
     {  
    564   mount ${ROOTHDD} ${INSTALLROOT} || dialog_die   mount ${ROOTHDD} ${INSTALLROOT} || dialog_die
    565   install -d ${INSTALLROOT}/boot || dialog_die   install -d ${INSTALLROOT}/boot || dialog_die
    566   cd ${INSTALLROOT} || dialog_die   cd ${INSTALLROOT} || dialog_die
    # Line 863  install_system_settings() Line 781  install_system_settings()
    781   # schreibe fstab   # schreibe fstab
    782   if is_uuid_supported   if is_uuid_supported
    783   then   then
      echo -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLROOT}/etc/fstab || dialog_die  
    784   echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die   echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die
    785   else   else
      echo -e "${BOOTHDD}\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLROOT}/etc/fstab || dialog_die  
    786   echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die   echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die
    787   fi   fi
    788   # not needed busybox loads all with swapon -a, even if not mentioned in fstab   # not needed busybox loads all with swapon -a, even if not mentioned in fstab
    # Line 891  install_system_settings() Line 807  install_system_settings()
    807   fi   fi
    808  }  }
    809    
     install_system_settings_flash()  
     {  
      # schreibe fstab  
      if is_uuid_supported  
      then  
      echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" > ${INSTALLROOT}/etc/fstab || dialog_die  
      else  
      echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" > ${INSTALLROOT}/etc/fstab || dialog_die  
      fi  
      echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die  
      echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die  
     }  
       
    810  install_umount_rootfs()  install_umount_rootfs()
    811  {  {
    812   cd /   cd /
    813   umount ${INSTALLROOT}/boot || dialog_die   umount ${INSTALLROOT}/boot || dialog_die
    814   umount ${INSTALLROOT} || dialog_die   umount ${INSTALLROOT} || dialog_die
      swapoff ${SWAPHDD} || dialog_die  
     }  
       
     install_umount_rootfs_flash()  
     {  
      cd /  
      umount ${INSTALLROOT} || dialog_die  
    815  }  }
    816    
    817  install_do_reboot()  install_do_reboot()
    # Line 949  run_install_normal() Line 845  run_install_normal()
    845   dialog_install_successful   dialog_install_successful
    846  }  }
    847    
     run_install_flash()  
     {  
      dialog_hardware_detection  
       
      dialog_setup_hdd_partitions_manuell_flash  
      dialog_setup_hdd_format  
      setup_hdd_format_flash > /dev/null  
      install_mount_rootfs_flash  
      (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image  
       
      dialog_install_settings  
      sleep 1  
      install_system_settings_flash  
      install_initrd_chroot  
       
      dialog_install_bootsector  
      install_bootsector_chroot  
       
      install_umount_rootfs_flash  
      dialog_install_successful  
     }  
       
    848  run_install_auto()  run_install_auto()
    849  {  {
    850   dialog_hardware_detection   dialog_hardware_detection
    851    
    852   dialog_setup_hdd_partitions_auto   dialog_setup_hdd_partitions_auto
    853   dialog_setup_hdd_format   dialog_setup_hdd_format
    854   setup_hdd_format_flash > /dev/null   setup_hdd_format > /dev/null
    855   install_mount_rootfs_flash   install_mount_rootfs
    856   (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image   (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image
    857    
    858   dialog_install_settings   dialog_install_settings
    859   sleep 1   sleep 1
    860   install_system_settings_flash   install_system_settings
    861   install_initrd_chroot   install_initrd_chroot
    862    
    863   dialog_install_bootsector   dialog_install_bootsector
    864   install_bootsector_chroot   install_bootsector_chroot
    865    
    866   install_umount_rootfs_flash   install_umount_rootfs
    867   dialog_install_successful   dialog_install_successful
    868  }  }
    869    
    Legend:
    Removed from v.2398  
    changed lines
      Added in v.2399