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 2493 by niro, Wed Jan 8 12:27:04 2014 UTC revision 2500 by niro, Wed Jan 8 13:20:29 2014 UTC
    # Line 107  mount_rootfs() Line 107  mount_rootfs()
    107   then   then
    108   echo $"${INSTALLROOT} already mounted" >&2   echo $"${INSTALLROOT} already mounted" >&2
    109   else   else
    110   mount "${ROOTHDD}" "${INSTALLROOT}" || dialog_die $"Could not mount rootfs - drive'${ROOTHDD}' -> '${INSTALLROOT}'"   mount "${ROOTHDD}" "${INSTALLROOT}" || dialog_die $"Could not mount rootfs - drive '${ROOTHDD}' -> '${INSTALLROOT}'"
    111   fi   fi
    112   [[ -d ${INSTALLROOT}/boot ]] || install -d ${INSTALLROOT}/boot   [[ -d ${INSTALLROOT}/boot ]] || install -d ${INSTALLROOT}/boot
    113  }  }
    # Line 310  install_system_settings() Line 310  install_system_settings()
    310   addconfig 'NETWORKING="dhcp"'   addconfig 'NETWORKING="dhcp"'
    311    
    312   # intel framebuffer quirk   # intel framebuffer quirk
    313   if [ -e ${INSTALLROOT}/etc/splash/splash.conf ]   CONFIG="${INSTALLROOT}/etc/splash/splash.conf"
    314     if [ -e ${CONFIG} ] && [ -e /proc/fb ]
    315   then   then
    316   if [ -e /proc/fb ]   if [[ ! -z $(grep 'inteldrmfb' /proc/fb) ]]
    317   then   then
    318   if [[ ! -z $(grep 'inteldrmfb' /proc/fb) ]]   fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:')
    319   then   [[ ${fbdev} != 0 ]] && sed -i "s:^\(SPLASH_DEV=\).*:\1\"/dev/fb${fbdev}\":" ${CONFIG} || dialog_die
      fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:')  
      if [[ ${fbdev} != 0 ]]  
      then  
      sed -i "s:^\(SPLASH_DEV=\).*:\1\"/dev/fb${fbdev}\":" ${INSTALLROOT}/etc/splash/splash.conf || dialog_die  
      fi  
      fi  
    320   fi   fi
    321   fi   fi
    322  }  }
    Legend:
    Removed from v.2493  
    changed lines
      Added in v.2500