Skip to content

Do not set the root option in /boot/grub2/grub.cfg (bsc#1236873) #2358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lslezak merged 1 commit into from
May 14, 2025
Merged

Do not set the root option in /boot/grub2/grub.cfg (bsc#1236873) #2358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions live/config-cdroot/fix_bootconfig.aarch64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ fi
test -f $dst/.profile && . $dst/.profile

arch=`uname -m`
profile=$(echo "$kiwi_profiles" | tr "-" " ")
profile=$(echo "$kiwi_profiles" | tr "_" " ")
label="$profile ($arch)"

if [ -d "$dst/boot/grub2/themes/SLE" ]; then
Expand All @@ -36,7 +36,6 @@ cat >$dst/boot/grub2/grub.cfg <<XXX
# Agama generated grub2 config file
set btrfs_relative_path="y"
export btrfs_relative_path
search --file --set=root /boot/0x11cebed2
set default=0
if [ -n "\$extra_cmdline" ]; then
submenu "Bootable snapshot \$snapshot_num" {
Expand Down
3 changes: 1 addition & 2 deletions live/config-cdroot/fix_bootconfig.x86_64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ fi
test -f $dst/.profile && . $dst/.profile

arch=`uname -m`
profile=$(echo "$kiwi_profiles" | tr "-" " ")
profile=$(echo "$kiwi_profiles" | tr "_" " ")
label="$profile ($arch)"

if [ -d "$dst/boot/grub2/themes/SLE" ]; then
Expand All @@ -36,7 +36,6 @@ cat >$dst/boot/grub2/grub.cfg <<XXX
# Agama generated grub2 config file
set btrfs_relative_path="y"
export btrfs_relative_path
search --file --set=root /boot/0xebe87947
set default=0
if [ -n "\$extra_cmdline" ]; then
submenu "Bootable snapshot \$snapshot_num" {
Expand Down
8 changes: 8 additions & 0 deletions live/src/agama-installer.changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue May 13 16:56:56 UTC 2025 - Ladislav Slezák <lslezak@suse.com>

- Do not set the root in /boot/grub2/grub.cfg file, it was wrong
and the root is already set in the /boot/grub2/earlyboot.cfg
file (bsc#1236873)
- Replace underscores in the boot menu label by spaces
Copy link
Copy Markdown
Contributor

@jreidinger jreidinger May 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would it make sense to replace both? like underscore and also dashes?

Copy link
Copy Markdown
Contributor Author

@lslezak lslezak May 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dashes actually cannot be used as the Kiwi profile name is then used as a part of the version in OBS and dash is not allowed in RPM version.


-------------------------------------------------------------------
Wed May 7 07:07:33 UTC 2025 - Ladislav Slezák <lslezak@suse.com>

Expand Down