Bug 55828 - memtest86+: merge patches to UCS UCS5.1 / 5.2
memtest86+: merge patches to UCS UCS5.1 / 5.2
Status: VERIFIED FIXED
Product: UCS
Classification: Unclassified
Component: General
UCS 5.1
All Linux
: P5 normal (vote)
: UCS 5.1
Assigned To: Florian Best
Philipp Hahn
:
Depends on:
Blocks: ucs520errata
  Show dependency treegraph
 
Reported: 2023-03-06 16:43 CET by Florian Best
Modified: 2023-11-14 20:12 CET (History)
1 user (show)

See Also:
What kind of report is it?: Development Internal
What type of bug is this?: ---
Who will be affected by this bug?: ---
How will those affected feel about the bug?: ---
User Pain:
Enterprise Customer affected?:
School Customer affected?:
ISV affected?:
Waiting Support:
Flags outvoted (downgraded) after PO Review:
Ticket number:
Bug group (optional):
Max CVSS v3 score:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Florian Best univentionstaff 2023-03-06 16:43:26 CET
The patches of memtest86+ have to be cherry-picked and rebased to (UCS 5.1 and) UCS 5.2.
Comment 1 Florian Best univentionstaff 2023-03-16 14:01:49 CET
No adjustment necessary for UCS 5.1.

r19796 | Bug #55828: remove patches
    it does not apply anymore, was updated by:
    
    https://salsa.debian.org/debian/memtest86plus/-/commit/7233e4801ffbf803d558c21186f32233c38b62c4
    https://salsa.debian.org/debian/memtest86plus/-/commit/c53ebb4809c1da66e1c81f69adbef1a58ed3ea1a
    https://salsa.debian.org/debian/memtest86plus/-/commit/659bbc836f63f1106c7c246c3e731ec97e35b85a
    
    A simpler solution than to patch this package seems to set
    GRUB_MEMTEST_DISABLE_SERIAL=true in the UCR template for /etc/default/grub

Therefor UCS is patched with:

diff --git a/base/univention-grub/conffiles/etc/default/grub b/base/univention-grub/conffiles/etc/default/grub
index 9384fbcc77..4a8a5c1405 100644
--- a/base/univention-grub/conffiles/etc/default/grub
+++ b/base/univention-grub/conffiles/etc/default/grub
@@ -77,3 +77,5 @@ if configRegistry.get('grub/backgroundimage', ''):
 
 # Uncomment to get a beep at grub start
 #GRUB_INIT_TUNE="480 440 1"
+
+GRUB_MEMTEST_DISABLE_SERIAL=true
Comment 2 Philipp Hahn univentionstaff 2023-11-14 20:12:31 CET
OK: diff -urN ucs_5.0-0/5.01-3 ucs_5.1-0/5.01-3.1

OK: dchdiff -l1 ucs_5.1-0/source/memtest86+_5.01-3.1A~5.1.0.202303141403.debian.tar.xz
FIXED: dchdiff -l1 ucs_5.2-0/source/memtest86+_6.10-4A~5.2.0.202303141401.debian.tar.xz

repo-apt-rm --delete ucs_5.2-0/source/memtest86+_6.10-4A~5.2.0.202303141401.dsc
repo-apt-copy -vcpa amd64 /mnt/build-storage/upstream/debian/pool/main/m/memtest86+/memtest86+_6.10-4.dsc
repo-apt-ftparchive .

OK: refactor(grub): disable serial memtest grub entries [ebbf418c986a0cd81b87a35fa2da505eca319bd1]