rpms/grubby
7
0
Fork 0
Code Issues Pull Requests Releases Activity

grubby-bls: remove -o option and support -c for ppc64le grub config

Browse Source 
Resolves: rhbz#1758598

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
This commit is contained in:
Javier Martinez Canillas 2019-11-22 15:52:17 +01:00
parent 77a8c0bcac
commit 5dafc374ee
No known key found for this signature in database
GPG Key ID: C751E590D63F3D69
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
grubby-bls
View File

@ -572,7 +572,7 @@ remove_var_prefix() {
update_grubcfg() update_grubcfg()
{ {
if [[ $arch = 'ppc64' || $arch = 'ppc64le' ]]; then if [[ $arch = 'ppc64' || $arch = 'ppc64le' ]]; then
grub2-mkconfig -o /boot/grub2/grub.cfg >& /dev/null grub2-mkconfig -o "${grub_config}" >& /dev/null
fi fi
} }
@ -595,7 +595,6 @@ Usage: grubby [OPTION...]
--initrd=initrd-path initrd image for the new kernel --initrd=initrd-path initrd image for the new kernel
-i, --extra-initrd=initrd-path auxiliary initrd image for things other than the new kernel -i, --extra-initrd=initrd-path auxiliary initrd image for things other than the new kernel
--make-default make the newly added entry the default boot entry --make-default make the newly added entry the default boot entry
-o, --output-file=path path to output updated config file ("-" for stdout)
--remove-args=STRING remove kernel arguments --remove-args=STRING remove kernel arguments
--remove-kernel=kernel-path remove all entries for the specified kernel --remove-kernel=kernel-path remove all entries for the specified kernel
--set-default=kernel-path make the first entry referencing the specified kernel the default --set-default=kernel-path make the first entry referencing the specified kernel the default
@ -611,9 +610,9 @@ Help options:
EOF EOF
} }
OPTS="$(getopt -o c:i:o:b:? --long help,add-kernel:,args:,bad-image-okay,\ OPTS="$(getopt -o c:i:b:? --long help,add-kernel:,args:,bad-image-okay,\
config-file:,copy-default,default-kernel,default-index,default-title,env:,\ config-file:,copy-default,default-kernel,default-index,default-title,env:,\
grub2,info:,initrd:,extra-initrd:,make-default,output-file:,remove-args:,\ grub2,info:,initrd:,extra-initrd:,make-default,remove-args:,\
remove-kernel:,set-default:,set-default-index:,title:,update-kernel:,zipl,\ remove-kernel:,set-default:,set-default-index:,title:,update-kernel:,zipl,\
bls-directory:,add-kernel:,add-multiboot:,mbargs:,mounts:,boot-filesystem:,\ bls-directory:,add-kernel:,add-multiboot:,mbargs:,mounts:,boot-filesystem:,\
bootloader-probe,debug,devtree,devtreedir:,elilo,efi,extlinux,grub,lilo,\ bootloader-probe,debug,devtree,devtreedir:,elilo,efi,extlinux,grub,lilo,\
@ -641,6 +640,7 @@ while [ ${#} -gt 0 ]; do
bad_image=true bad_image=true
;; ;;
--config-file|-c) --config-file|-c)
grub_config="${2}"
zipl_config="${2}" zipl_config="${2}"
shift shift
;; ;;
@ -678,10 +678,6 @@ while [ ${#} -gt 0 ]; do
--make-default) --make-default)
make_default=true make_default=true
;; ;;
--output-file|-o)
output_file="${2}"
shift
;;
--remove-args) --remove-args)
remove_args="${2}" remove_args="${2}"
shift shift
@ -754,6 +750,10 @@ if [[ -z $zipl_config ]]; then
zipl_config="/etc/zipl.conf" zipl_config="/etc/zipl.conf"
fi fi
if [[ -z $grub_config ]]; then
grub_config="/boot/grub2/grub.cfg"
fi
get_bls_values get_bls_values
default_index="$(get_default_index)" default_index="$(get_default_index)"