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 2443 by niro, Tue Jan 7 14:50:35 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   local CONFIG
    622   if is_uuid_supported  
    623   then   # write fstab
    624   echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die   CONFIG="${INSTALLROOT}/etc/fstab"
    625   else   clearconfig
    626   echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die   addconfig -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1"
    627   fi   addconfig -e "proc\t/proc\tproc\tdefaults\t0 0"
    628   # not needed busybox loads all with swapon -a, even if not mentioned in fstab   addconfig -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0"
      #echo -e "UUID='$(get_uuid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0" >> ${INSTALLROOT}/etc/fstab || dialog_die  
      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  
    629    
    630   # install network config skeleton   # install network config skeleton
    631   install -m0644 ${INSTALLROOT}/etc/alxconfig-ng/skel/net/net.eth0 ${INSTALLROOT}/etc/conf.d/ || dialog_die   CONFIG="${INSTALLROOT}/etc/conf.d/net.eth0"
    632     clearconfig
    633     addconfig 'ONBOOT="yes"'
    634     addconfig 'NETWORKING="dhcp"'
    635    
    636   # intel framebufer quirk   # intel framebuffer quirk
    637   if [[ -e /proc/fb ]]   if [ -e ${INSTALLROOT}/etc/splash/splash.conf ]
    638   then   then
    639   if [[ ! -z $(grep 'inteldrmfb' /proc/fb) ]]   if [ -e /proc/fb ]
    640   then   then
    641   fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:')   if [[ ! -z $(grep 'inteldrmfb' /proc/fb) ]]
      if [[ ${fbdev} != 0 ]]  
    642   then   then
    643   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:')
    644     if [[ ${fbdev} != 0 ]]
    645     then
    646     sed -i "s:^\(SPLASH_DEV=\).*:\1\"/dev/fb${fbdev}\":" ${INSTALLROOT}/etc/splash/splash.conf || dialog_die
    647     fi
    648   fi   fi
    649   fi   fi
    650   fi   fi
    # Line 701  run_install_normal() Line 678  run_install_normal()
    678   dialog_install_settings   dialog_install_settings
    679   sleep 1   sleep 1
    680   install_system_settings   install_system_settings
    681   dialog_install_initrd   if is_initrd_supported
    682   install_initrd_chroot   then
    683     dialog_install_initrd
    684     initrd_config
    685     initrd_install
    686     fi
    687    
    688   dialog_install_bootsector   dialog_install_bootsector
    689   install_bootsector_chroot   bootloader_config
    690     bootloader_install
    691    
    692   install_umount_rootfs   install_umount_rootfs
    693   dialog_install_successful   dialog_install_successful
    # Line 724  run_install_auto() Line 706  run_install_auto()
    706   dialog_install_settings   dialog_install_settings
    707   sleep 1   sleep 1
    708   install_system_settings   install_system_settings
    709   dialog_install_initrd   if is_initrd_supported
    710   install_initrd_chroot   then
    711     dialog_install_initrd
    712     initrd_config
    713     initrd_install
    714     fi
    715    
    716   dialog_install_bootsector   dialog_install_bootsector
    717   install_bootsector_chroot   bootloader_config
    718     bootloader_install
    719    
    720   install_umount_rootfs   install_umount_rootfs
    721   dialog_install_successful   dialog_install_successful
    Legend:
    Removed from v.2438  
    changed lines
      Added in v.2443