packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

grub-generator: If OSTREE_BOOT_PARTITION is not set, default to /boot 

Closes: #1326
Approved by: cgwalters
This commit is contained in:
Carlos Alberto Lopez Perez 2017-11-06 17:29:13 +01:00 committed by Atomic Bot
parent 4a58364cfa
commit 20996d0da3
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/boot/grub2/ostree-grub-generator
View File

@ -61,7 +61,12 @@ read_config()
populate_menu() populate_menu()
{ {
# Default to /boot if OSTREE_BOOT_PARTITION is not set and /boot is on the same device than ostree/repo
if [ -z ${OSTREE_BOOT_PARTITION+x} ] && [ -d /boot/ostree ] && [ -d /ostree/repo ] && [ $(stat -c '%d' /boot/ostree) -eq $(stat -c '%d' /ostree/repo) ]; then
boot_prefix="/boot"
else
boot_prefix="${OSTREE_BOOT_PARTITION}" boot_prefix="${OSTREE_BOOT_PARTITION}"
fi
for config in $(ls ${entries_path}); do for config in $(ls ${entries_path}); do
read_config ${config} read_config ${config}
menu="${menu}menuentry '${title}' {\n" menu="${menu}menuentry '${title}' {\n"