205 |
fi |
fi |
206 |
|
|
207 |
# get the root filesystem to use |
# get the root filesystem to use |
208 |
rootdevice=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $1; }}' /etc/fstab) |
rootdevice=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $1; }}' /etc/fstab 2>/dev/null) |
209 |
|
if [[ -z $rootdevice ]] |
210 |
|
then |
211 |
|
rootdevice=$(grep -o -P "(?<=root=)\S+" /proc/cmdline) |
212 |
|
fi |
213 |
|
|
214 |
if [[ -n ${mbkernel} ]] && [[ -n ${cfgLilo} ]] && [[ ${liloFlag} != elilo ]] |
if [[ -n ${mbkernel} ]] && [[ -n ${cfgLilo} ]] && [[ ${liloFlag} != elilo ]] |
215 |
then |
then |
282 |
else |
else |
283 |
title="Magellan Linux [ ${version} ]" |
title="Magellan Linux [ ${version} ]" |
284 |
fi |
fi |
285 |
${grubby} --grub2 -c ${grub2EfiConfig} \ |
${grubby} --grub2 -c ${grub2EfiConfig} --efi \ |
286 |
--add-kernel=${bootPrefix}/${kernelName}-${version} \ |
--add-kernel=${bootPrefix}/${kernelName}-${version} \ |
287 |
${INITRD} --copy-default ${makedefault} --title "${title}" \ |
${INITRD} --copy-default ${makedefault} --title "${title}" \ |
288 |
${mbkernel:+--add-multiboot="${mbkernel}"} \ |
${mbkernel:+--add-multiboot="${mbkernel}"} \ |
371 |
if [[ -n ${cfgGrub2Efi} ]] |
if [[ -n ${cfgGrub2Efi} ]] |
372 |
then |
then |
373 |
[[ -n ${verbose} ]] && echo "removing ${version} from ${grub2EfiConfig}" |
[[ -n ${verbose} ]] && echo "removing ${version} from ${grub2EfiConfig}" |
374 |
${grubby} --grub2 -c ${grub2EfiConfig} \ |
${grubby} --grub2 -c ${grub2EfiConfig} --efi \ |
375 |
--remove-kernel=${bootPrefix}/${kernelName}-${version} |
--remove-kernel=${bootPrefix}/${kernelName}-${version} |
376 |
else |
else |
377 |
[[ -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" |
507 |
if [[ -n ${cfgGrub2Efi} ]] |
if [[ -n ${cfgGrub2Efi} ]] |
508 |
then |
then |
509 |
[[ -n ${verbose} ]] && echo "updating ${version} from ${grub2EfiConfig}" |
[[ -n ${verbose} ]] && echo "updating ${version} from ${grub2EfiConfig}" |
510 |
${grubby} --grub2 -c ${grub2EfiConfig} \ |
${grubby} --grub2 -c ${grub2EfiConfig} --efi \ |
511 |
--update-kernel=${bootPrefix}/${kernelName}-${version} \ |
--update-kernel=${bootPrefix}/${kernelName}-${version} \ |
512 |
${INITRD} \ |
${INITRD} \ |
513 |
${kernargs:+--args="${kernargs}"} \ |
${kernargs:+--args="${kernargs}"} \ |
800 |
# add dracut i18n, keyboard and plymouth kernel args if requested |
# add dracut i18n, keyboard and plymouth kernel args if requested |
801 |
if [[ -n ${dracut} ]] || [[ -n ${adddracutargs} ]] |
if [[ -n ${dracut} ]] || [[ -n ${adddracutargs} ]] |
802 |
then |
then |
803 |
[ -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} ]] |
|
804 |
then |
then |
805 |
kernargs="${kernargs} KEYTABLE=${KEYMAP}" |
. /etc/vconsole.conf |
806 |
|
|
807 |
|
for i in SYSFONT SYSFONTACM UNIMAP KEYTABLE |
808 |
|
do |
809 |
|
val=$(eval echo \$$i) |
810 |
|
[[ -n ${val} ]] && kernargs="${kernargs} ${i}=${val}" |
811 |
|
done |
812 |
|
else |
813 |
|
if [ -r /etc/conf.d/consolefont ] |
814 |
|
then |
815 |
|
. /etc/conf.d/consolefont |
816 |
|
|
817 |
|
if [[ -n ${CONSOLEFONT} ]] |
818 |
|
then |
819 |
|
kernargs="${kernargs} SYSFONT=${CONSOLEFONT}" |
820 |
|
fi |
821 |
|
fi |
822 |
|
|
823 |
|
if [ -r /etc/conf.d/keymap ] |
824 |
|
then |
825 |
|
. /etc/conf.d/keymap |
826 |
|
|
827 |
|
if [[ -n ${KEYMAP} ]] |
828 |
|
then |
829 |
|
kernargs="${kernargs} KEYTABLE=${KEYMAP}" |
830 |
|
fi |
831 |
|
fi |
832 |
fi |
fi |
833 |
|
|
834 |
if [[ -n ${CONSOLEFONT} ]] |
if [ -r /etc/locale.conf ] |
835 |
then |
then |
836 |
kernargs="${kernargs} SYSFONT=${CONSOLEFONT}" |
. /etc/locale.conf |
837 |
|
|
838 |
|
if [[ -n ${LANG} ]] |
839 |
|
then |
840 |
|
kernargs="${kernargs} LANG=${LANG}" |
841 |
|
fi |
842 |
fi |
fi |
843 |
fi |
fi |
844 |
|
|