Magellan Linux

Diff of /trunk/installer-simple/bin/installer.sh.in

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2436 by niro, Tue Jan 7 14:25:34 2014 UTC revision 2439 by niro, Tue Jan 7 14:37:35 2014 UTC
# Line 438  EOF Line 438  EOF
438  setup_hdd_partitions_manual()  setup_hdd_partitions_manual()
439  {  {
440   ROOTHDD="${HDD}1"   ROOTHDD="${HDD}1"
441     SWAPHDD=""
442   ## hdds partitionieren manual   BOOTHDD=""
443   cfdisk ${HDD} || dialog_die   cfdisk ${HDD} || dialog_die
444  }  }
445    
# 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

Legend:
Removed from v.2436  
changed lines
  Added in v.2439