[arvados] updated: 2.6.0-339-g8a4e9ad63

[git repository hosting]

Summary of changes:
 tools/compute-images/scripts/base.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

       via  8a4e9ad63ef8782c1892eaa259b62b3b3730f67b (commit)
      from  8613ee5ce693d88570794d1a2fc071c43832fc1a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 8a4e9ad63ef8782c1892eaa259b62b3b3730f67b
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date:   Wed Jul 5 14:28:54 2023 -0300

    20707: Don't rely on GRUB_CMDLINE_LINUX be empty in /etc/default/grub
    
    Debian 11 AWS AMIs come with some settings added in that variable.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>

diff --git a/tools/compute-images/scripts/base.sh b/tools/compute-images/scripts/base.sh
index c500dc18c..447d15ca4 100644
--- a/tools/compute-images/scripts/base.sh
+++ b/tools/compute-images/scripts/base.sh
@@ -150,7 +150,7 @@ $SUDO mkdir -p /etc/arvados/docker-cleaner
 $SUDO echo -e "{\n  \"Quota\": \"10G\",\n  \"RemoveStoppedContainers\": \"always\"\n}" > /etc/arvados/docker-cleaner/docker-cleaner.json
 
 # Enable cgroup accounting (forcing cgroups v1)
-$SUDO sed -i 's/GRUB_CMDLINE_LINUX=""/GRUB_CMDLINE_LINUX="cgroup_enable=memory swapaccount=1 systemd.unified_cgroup_hierarchy=0"/g' /etc/default/grub
+$SUDO echo 'GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX cgroup_enable=memory swapaccount=1 systemd.unified_cgroup_hierarchy=0"' >> /etc/default/grub
 $SUDO update-grub
 
 # Make sure user_allow_other is set in fuse.conf

-----------------------------------------------------------------------


hooks/post-receive
--