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 1940 by niro, Mon Oct 1 12:39:50 2012 UTC revision 2059 by niro, Wed Feb 20 14:28:56 2013 UTC
    # Line 367  remove() Line 367  remove()
    367   if [[ -n ${cfgGrub2Efi} ]]   if [[ -n ${cfgGrub2Efi} ]]
    368   then   then
    369   [[ -n ${verbose} ]] && echo "removing ${version} from ${grub2EfiConfig}"   [[ -n ${verbose} ]] && echo "removing ${version} from ${grub2EfiConfig}"
    370   ${grubby} --grub2 -c ${grub2EfiConfig} \   ${grubby} --grub2 -c ${grub2EfiConfig} --efi \
    371   --remove-kernel=${bootPrefix}/${kernelName}-${version}   --remove-kernel=${bootPrefix}/${kernelName}-${version}
    372   else   else
    373   [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby grub 2 with UEFI"   [[ -n ${verbose} ]] && echo "${grub2EfiConfig} does not exist, not running grubby grub 2 with UEFI"
    # Line 503  update() Line 503  update()
    503   if [[ -n ${cfgGrub2Efi} ]]   if [[ -n ${cfgGrub2Efi} ]]
    504   then   then
    505   [[ -n ${verbose} ]] && echo "updating ${version} from ${grub2EfiConfig}"   [[ -n ${verbose} ]] && echo "updating ${version} from ${grub2EfiConfig}"
    506   ${grubby} --grub2 -c ${grub2EfiConfig} \   ${grubby} --grub2 -c ${grub2EfiConfig} --efi \
    507   --update-kernel=${bootPrefix}/${kernelName}-${version} \   --update-kernel=${bootPrefix}/${kernelName}-${version} \
    508   ${INITRD} \   ${INITRD} \
    509   ${kernargs:+--args="${kernargs}"} \   ${kernargs:+--args="${kernargs}"} \
    # Line 796  fi Line 796  fi
    796  # add dracut i18n, keyboard and plymouth kernel args if requested  # add dracut i18n, keyboard and plymouth kernel args if requested
    797  if [[ -n ${dracut} ]] || [[ -n ${adddracutargs} ]]  if [[ -n ${dracut} ]] || [[ -n ${adddracutargs} ]]
    798  then  then
    799   [ -r /etc/conf.d/keymap ] && . /etc/conf.d/keymap   if [ -r /etc/vconsole.conf ]
      [ -r /etc/conf.d/consolefont ] && . /etc/conf.d/consolefont  
       
      if [[ -n ${KEYMAP} ]]  
    800   then   then
    801   kernargs="${kernargs} KEYTABLE=${KEYMAP}"   . /etc/vconsole.conf
    802    
    803     for i in SYSFONT SYSFONTACM UNIMAP KEYTABLE
    804     do
    805     val=$(eval echo \$$i)
    806     [[ -n ${val} ]] && kernargs="${kernargs} ${i}=${val}"
    807     done
    808     else
    809     if [ -r /etc/conf.d/consolefont ]
    810     then
    811     . /etc/conf.d/consolefont
    812    
    813     if [[ -n ${CONSOLEFONT} ]]
    814     then
    815     kernargs="${kernargs} SYSFONT=${CONSOLEFONT}"
    816     fi
    817     fi
    818    
    819     if  [ -r /etc/conf.d/keymap ]
    820     then
    821     . /etc/conf.d/keymap
    822    
    823     if [[ -n ${KEYMAP} ]]
    824     then
    825     kernargs="${kernargs} KEYTABLE=${KEYMAP}"
    826     fi
    827     fi
    828   fi   fi
    829    
    830   if [[ -n ${CONSOLEFONT} ]]   if [ -r /etc/locale.conf ]
    831   then   then
    832   kernargs="${kernargs} SYSFONT=${CONSOLEFONT}"   . /etc/locale.conf
    833    
    834     if [[ -n ${LANG} ]]
    835     then
    836     kernargs="${kernargs} LANG=${LANG}"
    837     fi
    838   fi   fi
    839  fi  fi
    840    
    Legend:
    Removed from v.1940  
    changed lines
      Added in v.2059