| Summary: | dracut: warning about missing surrounding white spaces in /etc/dracut.conf.d/51-mageia-resume.conf while updating mga7 to upcoming mga8 | ||
|---|---|---|---|
| Product: | Mageia | Reporter: | Jani Välimaa <jani.valimaa> |
| Component: | RPM Packages | Assignee: | Mageia tools maintainers <mageiatools> |
| Status: | REOPENED --- | QA Contact: | |
| Severity: | normal | ||
| Priority: | Normal | CC: | davidwhodgins, doktor5000, estellnb, mageia, mageia, mageia, ouaurelien |
| Version: | Cauldron | ||
| Target Milestone: | --- | ||
| Hardware: | All | ||
| OS: | Linux | ||
| Whiteboard: | |||
| Source RPM: | CVE: | ||
| Status comment: | |||
|
Description
Jani Välimaa
2021-01-10 09:08:33 CET
Thanks for the notification. Same question as before: did it stop the upgrade, or did that continue anyway? Assigning to the Mageiatools group. Assignee:
bugsquad =>
mageiatools This was only a warning and installation continued. Martin,
According to dracut WARNING, can i commit this ?
It added white spaces before and after $biggest_swap_dev
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 24c3575ad..2fdf15902 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -174,7 +174,7 @@ sub setupBootloaderBefore {
my $biggest_swap_dev = fs::wild_device::from_part('', $biggest_swap);
bootloader::set_append_with_key($bootloader, resume => $biggest_swap_dev);
mkdir_p("$::prefix/etc/dracut.conf.d");
- output("$::prefix/etc/dracut.conf.d/51-mageia-resume.conf", qq(add_device+="$biggest_swap_dev"\n));
+ output("$::prefix/etc/dracut.conf.d/51-mageia-resume.conf", qq(add_device+=" $biggest_swap_dev "\n));
}
}CC:
(none) =>
mageia, mageia That looks OK to me. thank you for the review. I commited it commit: b2d062329f10000e007b80cc72f10c3c649341eb Resolution:
(none) =>
FIXED I think the bug shouldn't be closed before the fix is pushed to BS and the fix is confirmed. Status:
RESOLVED =>
REOPENED you are right :-) What's the status of this? Was the fix included in mga8? For a fresh installation /etc/dracut.conf.d/51-mageia-resume.conf looks fine here with surrounding spaces, although for upgrades this might still be an issue. CC:
(none) =>
doktor5000 (In reply to Florian Hubold from comment #9) > For a fresh installation /etc/dracut.conf.d/51-mageia-resume.conf looks fine > here with surrounding spaces, although for upgrades this might still be an > issue. Agreed! CC:
(none) =>
ouaurelien fix is not included in mga9. or not executed - got the same error. CC:
(none) =>
mageia In a fresh install of mga9 [root@localhost ~]# cat /etc/dracut.conf.d/51-mageia-resume.conf add_device+=" UUID=fa0e642f-8238-4290-b47b-fcf820e94d66 " so the fix is included. But as mentioned in comment 9 and in my recent reply on the dev ML, it only applies to fresh installs, not upgrades. shouldn't we add an upgrade-script that corrects (generated) files in this dir? The following works as a script. Would it work as a post-install scriptlet
for dracut?
ConfFile="/etc/dracut.conf.d/51-mageia-resume.conf"
if [[ -e "$ConfFile" ]] ; then
. "$ConfFile"
ResumeConf=$(cat "$ConfFile")
read -rd device <<< "$add_device" # Remove leading/trailing spaces
FixedResumeConf='add_device+=" '"$device"' "'
if [ "$ResumeConf" != "$FixedResumeConf" ] ; then
echo "$FixedResumeConf" > "$ConfFile"
fi
fiCC:
(none) =>
davidwhodgins |