From 30cc959787402b3cd0d26cee748dbd4d6e90723e Mon Sep 17 00:00:00 2001
From: Samuel Angebault <staphylo@arista.com>
Date: Tue, 20 Apr 2021 14:55:14 -0700
Subject: [PATCH] [Arista] Fix dockerd issue on Arista platforms (#7376)

Why I did it
Recent systemd upgrade from #7228 requires an extra cmdline parameter for dockerd to start properly.
Updating boot0 was missed as part of the systemd upgrade change.

How I did it
Just added the missing cmdline parameter in files/Aboot/boot0.j2
This change fixes #7372

How to verify it
Boot the image and dockerd should start normally.
---
 files/Aboot/boot0.j2 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/files/Aboot/boot0.j2 b/files/Aboot/boot0.j2
index 7e1f41ac04c4..35893eb2f35e 100644
--- a/files/Aboot/boot0.j2
+++ b/files/Aboot/boot0.j2
@@ -614,6 +614,9 @@ write_image_specific_cmdline() {
     # disable deterministic interface naming
     cmdline_add net.ifnames=0
 
+    # disable unified cgroup hierarchy to workaround dockerd limitation
+    cmdline_add systemd.unified_cgroup_hierarchy=0
+
     # verbosity
     cmdline_add quiet
     # Start showing systemd information from the first failing unit if any.