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 2438 by niro, Tue Jan 7 14:30:19 2014 UTC revision 2442 by niro, Tue Jan 7 14:48:42 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 574  CHROOTEOF Line 569  CHROOTEOF
    569   rm ${INSTALLROOT}/root/.installrc   rm ${INSTALLROOT}/root/.installrc
    570  }  }
    571    
     is_initrd_supported()  
     {  
      # only generate initrds if the cmd exists  
      [[ -x ${INSTALLROOT}/sbin/mkinitrd ]] && return 0  
      return 1  
     }  
       
    572  install_initrd_chroot()  install_initrd_chroot()
    573  {  {
    574   # only generate initrds if the cmd exists   # only generate initrds if the cmd exists
    # Line 628  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 659  install_system_settings() Line 628  install_system_settings()
    628   # install network config skeleton   # install network config skeleton
    629   install -m0644 ${INSTALLROOT}/etc/alxconfig-ng/skel/net/net.eth0 ${INSTALLROOT}/etc/conf.d/ || dialog_die   install -m0644 ${INSTALLROOT}/etc/alxconfig-ng/skel/net/net.eth0 ${INSTALLROOT}/etc/conf.d/ || dialog_die
    630    
    631   # intel framebufer quirk   # intel framebuffer quirk
    632   if [[ -e /proc/fb ]]   if [ -e ${INSTALLROOT}/etc/splash/splash.conf ]
    633   then   then
    634   if [[ ! -z $(grep 'inteldrmfb' /proc/fb) ]]   if [ -e /proc/fb ]
    635   then   then
    636   fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:')   if [[ ! -z $(grep 'inteldrmfb' /proc/fb) ]]
      if [[ ${fbdev} != 0 ]]  
    637   then   then
    638   sed -i "s:^\(SPLASH_DEV=\).*:\1\"/dev/fb${fbdev}\":" ${INSTALLROOT}/etc/splash/splash.conf || dialog_die   fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:')
    639     if [[ ${fbdev} != 0 ]]
    640     then
    641     sed -i "s:^\(SPLASH_DEV=\).*:\1\"/dev/fb${fbdev}\":" ${INSTALLROOT}/etc/splash/splash.conf || dialog_die
    642     fi
    643   fi   fi
    644   fi   fi
    645   fi   fi
    # Line 701  run_install_normal() Line 673  run_install_normal()
    673   dialog_install_settings   dialog_install_settings
    674   sleep 1   sleep 1
    675   install_system_settings   install_system_settings
    676   dialog_install_initrd   if is_initrd_supported
    677   install_initrd_chroot   then
    678     dialog_install_initrd
    679     initrd_config
    680     initrd_install
    681     fi
    682    
    683   dialog_install_bootsector   dialog_install_bootsector
    684   install_bootsector_chroot   bootloader_config
    685     bootloader_install
    686    
    687   install_umount_rootfs   install_umount_rootfs
    688   dialog_install_successful   dialog_install_successful
    # Line 724  run_install_auto() Line 701  run_install_auto()
    701   dialog_install_settings   dialog_install_settings
    702   sleep 1   sleep 1
    703   install_system_settings   install_system_settings
    704   dialog_install_initrd   if is_initrd_supported
    705   install_initrd_chroot   then
    706     dialog_install_initrd
    707     initrd_config
    708     initrd_install
    709     fi
    710    
    711   dialog_install_bootsector   dialog_install_bootsector
    712   install_bootsector_chroot   bootloader_config
    713     bootloader_install
    714    
    715   install_umount_rootfs   install_umount_rootfs
    716   dialog_install_successful   dialog_install_successful
    Legend:
    Removed from v.2438  
    changed lines
      Added in v.2442