Skip to content
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

Jump to bottom

Add soft failure to boot image when kernel arg noresume ignored #4546

Merged
merged 1 commit into from
Mar 12, 2018
Merged

Add soft failure to boot image when kernel arg noresume ignored #4546

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
4 changes: 4 additions & 0 deletions tests/shutdown/grub_set_bootargs.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ sub run {
}
}
push @cmds, 'sed -i "s#GRUB_CMDLINE_LINUX_DEFAULT=\"[^\"]*\"#GRUB_CMDLINE_LINUX_DEFAULT=\"$new_cmdline\"#" /etc/default/grub';
if (script_run('! grep -q resume=.*by-path /proc/cmdline')) {
record_soft_failure "boo#1079537 - kernel argument noresume ignored - resume from suspend failing when the image started on different VM";
push @cmds, 'sed -i "s/# GRUB_DISABLE_LINUX_UUID=true/GRUB_DISABLE_LINUX_UUID=true/" /etc/default/grub';
}
push @cmds, 'grub2-mkconfig -o /boot/grub2/grub.cfg';

# Slow type for 12-SP2 aarch64 image creation test to try to avoid filling up the key event queue
Expand Down