Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/grubby/new-kernel-pkg

    Diff of /trunk/grubby/new-kernel-pkg

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

    revision 3003 by niro, Thu Jun 30 10:39:38 2016 UTC revision 3004 by niro, Tue Jun 27 14:22:13 2017 UTC
    # Line 924  then Line 924  then
    924  fi  fi
    925  [[ -n ${verbose} ]] && echo "devtreedir is ${devtreedir}"  [[ -n ${verbose} ]] && echo "devtreedir is ${devtreedir}"
    926    
    927  # add dracut i18n, keyboard and plymouth kernel args if requested  # add dracut kernel args if requested
    928  if [[ -n ${dracut} ]] || [[ -n ${adddracutargs} ]]  if [[ -n ${dracut} ]] && [[ -n ${adddracutargs} ]]
    929  then   [ -r /etc/vconsole.conf ] && . /etc/vconsole.conf
    930   if [ -r /etc/vconsole.conf ]   [ -r /etc/locale.conf ] && . /etc/locale.conf
    931   then  
    932   . /etc/vconsole.conf   while read opt rd_opt
    933     do
    934   for i in SYSFONT SYSFONTACM UNIMAP KEYTABLE   [ -n "${!opt}" ] && kernargs="$kernargs $rd_opt=\"${!opt}\""
    935   do   done <<< 'KEYMAP rd.vconsole.keymap
    936   val=$(eval echo \$$i)   FONT rd.vconsole.font
    937   [[ -n ${val} ]] && kernargs="${kernargs} ${i}=${val}"   FONT_MAP rd.vconsole.font.map
    938   done   FONT_UNIMAP rd.vconsole.font.unimap
    939   else   UNICODE rd.vconsole.font.unicode
    940   if [ -r /etc/conf.d/consolefont ]   EXT_KEYMAP rd.vconsole.keymap.ext
    941   then   LANG rd.locale.LANG
    942   . /etc/conf.d/consolefont   LC_ALL rd.locale.LC_ALL'
       
      if [[ -n ${CONSOLEFONT} ]]  
      then  
      kernargs="${kernargs} SYSFONT=${CONSOLEFONT}"  
      fi  
      fi  
       
      if  [ -r /etc/conf.d/keymap ]  
      then  
      . /etc/conf.d/keymap  
       
      if [[ -n ${KEYMAP} ]]  
      then  
      kernargs="${kernargs} KEYTABLE=${KEYMAP}"  
      fi  
      fi  
      fi  
       
      if [ -r /etc/locale.conf ]  
      then  
      . /etc/locale.conf  
       
      if [[ -n ${LANG} ]]  
      then  
      kernargs="${kernargs} LANG=${LANG}"  
      fi  
      fi  
    943  fi  fi
    944    
    945  # set this as the default if we have the package and it matches  # set this as the default if we have the package and it matches
    Legend:
    Removed from v.3003  
    changed lines
      Added in v.3004