Magellan Linux

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

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

revision 2439 by niro, Tue Jan 7 14:37:35 2014 UTC revision 2441 by niro, Tue Jan 7 14:46:13 2014 UTC
# Line 514  install_bootsector_chroot() Line 514  install_bootsector_chroot()
514   [[ -z ${KRNIMG} ]] && KRNIMG="vmlinuz"   [[ -z ${KRNIMG} ]] && KRNIMG="vmlinuz"
515    
516   # uuid support   # uuid support
517   if is_uuid_supported   my_roothdd="UUID=$(get_uuid ${ROOTHDD})"
  then  
  my_roothdd="UUID=$(get_uuid ${ROOTHDD})"  
  else  
  my_roothdd="${ROOTHDD}"  
  fi  
518    
519   : > ${grubconf} || dialog_die   : > ${grubconf} || dialog_die
520   echo "default 0" >> ${grubconf} || dialog_die   echo "default 0" >> ${grubconf} || dialog_die
# Line 621  CHROOTEOF Line 616  CHROOTEOF
616   rm ${INSTALLROOT}/root/.installrc   rm ${INSTALLROOT}/root/.installrc
617  }  }
618    
 is_uuid_supported()  
 {  
  if [[ -x $(type -P busybox.mkinitrd) ]]  
  then  
  # only detect uuids if supported  
  if [[ ! -z $(busybox.mkinitrd | grep blkid) ]]  
  then  
  return 0  
  fi  
  fi  
   
  return 1  
 }  
   
619  install_system_settings()  install_system_settings()
620  {  {
621   # schreibe fstab   # schreibe fstab
622   if is_uuid_supported   echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die
  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  
623   # 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
624   #echo -e "UUID='$(get_uuid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die   #echo -e "UUID='$(get_uuid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die
625   echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die   echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die
# Line 694  run_install_normal() Line 670  run_install_normal()
670   dialog_install_settings   dialog_install_settings
671   sleep 1   sleep 1
672   install_system_settings   install_system_settings
673   dialog_install_initrd   if is_initrd_supported
674   install_initrd_chroot   then
675     dialog_install_initrd
676     initrd_config
677     initrd_install
678     fi
679    
680   dialog_install_bootsector   dialog_install_bootsector
681   install_bootsector_chroot   bootloader_config
682     bootloader_install
683    
684   install_umount_rootfs   install_umount_rootfs
685   dialog_install_successful   dialog_install_successful
# Line 717  run_install_auto() Line 698  run_install_auto()
698   dialog_install_settings   dialog_install_settings
699   sleep 1   sleep 1
700   install_system_settings   install_system_settings
701   dialog_install_initrd   if is_initrd_supported
702   install_initrd_chroot   then
703     dialog_install_initrd
704     initrd_config
705     initrd_install
706     fi
707    
708   dialog_install_bootsector   dialog_install_bootsector
709   install_bootsector_chroot   bootloader_config
710     bootloader_install
711    
712   install_umount_rootfs   install_umount_rootfs
713   dialog_install_successful   dialog_install_successful

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