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 2437 by niro, Tue Jan 7 14:28:13 2014 UTC revision 2440 by niro, Tue Jan 7 14:42:51 2014 UTC
    # Line 574  CHROOTEOF Line 574  CHROOTEOF
    574   rm ${INSTALLROOT}/root/.installrc   rm ${INSTALLROOT}/root/.installrc
    575  }  }
    576    
     is_initrd_supported()  
     {  
      # only generate initrds if the cmd exists  
      [[ -x ${INSTALLROOT}/sbin/mkinitrd ]] && return 0  
      return 1  
     }  
       
    577  install_initrd_chroot()  install_initrd_chroot()
    578  {  {
    579   # only generate initrds if the cmd exists   # only generate initrds if the cmd exists
    # Line 642  is_uuid_supported() Line 635  is_uuid_supported()
    635   return 1   return 1
    636  }  }
    637    
     get_uuid()  
     {  
      local UUID  
      local SEC_TYPE  
      local TYPE  
       
      local dev="$1"  
      [[ -z ${dev} ]] && dialog_die "no dev given"  
       
      # check if given device is already an UUID  
      if [[ ${dev/UUID=/}x != ${dev}x ]]  
      then  
      eval "${dev}"  
      else  
      eval $(busybox.mkinitrd blkid ${dev} | grep "${dev}:" | sed 's/.*:\ //')  
      fi  
      echo "${UUID}"  
     }  
       
    638  install_system_settings()  install_system_settings()
    639  {  {
    640   # schreibe fstab   # schreibe fstab
    # Line 720  run_install_normal() Line 694  run_install_normal()
    694   dialog_install_settings   dialog_install_settings
    695   sleep 1   sleep 1
    696   install_system_settings   install_system_settings
    697   dialog_install_initrd   if is_initrd_supported
    698   install_initrd_chroot   then
    699     dialog_install_initrd
    700     initrd_config
    701     initrd_install
    702     fi
    703    
    704   dialog_install_bootsector   dialog_install_bootsector
    705   install_bootsector_chroot   bootloader_config
    706     bootloader_install
    707    
    708   install_umount_rootfs   install_umount_rootfs
    709   dialog_install_successful   dialog_install_successful
    # Line 743  run_install_auto() Line 722  run_install_auto()
    722   dialog_install_settings   dialog_install_settings
    723   sleep 1   sleep 1
    724   install_system_settings   install_system_settings
    725   dialog_install_initrd   if is_initrd_supported
    726   install_initrd_chroot   then
    727     dialog_install_initrd
    728     initrd_config
    729     initrd_install
    730     fi
    731    
    732   dialog_install_bootsector   dialog_install_bootsector
    733   install_bootsector_chroot   bootloader_config
    734     bootloader_install
    735    
    736   install_umount_rootfs   install_umount_rootfs
    737   dialog_install_successful   dialog_install_successful
    Legend:
    Removed from v.2437  
    changed lines
      Added in v.2440