diff options
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/cirrus/packer/ubuntu_setup.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/contrib/cirrus/packer/ubuntu_setup.sh b/contrib/cirrus/packer/ubuntu_setup.sh index 46e7a620f..6bcf7d5f3 100644 --- a/contrib/cirrus/packer/ubuntu_setup.sh +++ b/contrib/cirrus/packer/ubuntu_setup.sh @@ -145,12 +145,6 @@ else /tmp/$(basename $BATS_URL) btrfs-tools ) - - echo "Forced Ubuntu 18 kernel to enable cgroup swap accounting." - SEDCMD='s/^GRUB_CMDLINE_LINUX="(.*)"/GRUB_CMDLINE_LINUX="\1 cgroup_enable=memory swapaccount=1"/g' - ooe.sh sudo sed -re "$SEDCMD" -i /etc/default/grub.d/* - ooe.sh sudo sed -re "$SEDCMD" -i /etc/default/grub - ooe.sh sudo update-grub fi echo "Installing general testing and system dependencies" @@ -174,6 +168,12 @@ then sudo ln -f "$CRIO_RUNC_PATH" "/usr/bin/runc" fi +echo "Making Ubuntu kernel to enable cgroup swap accounting as it is not the default." +SEDCMD='s/^GRUB_CMDLINE_LINUX="(.*)"/GRUB_CMDLINE_LINUX="\1 cgroup_enable=memory swapaccount=1"/g' +ooe.sh sudo sed -re "$SEDCMD" -i /etc/default/grub.d/* +ooe.sh sudo sed -re "$SEDCMD" -i /etc/default/grub +ooe.sh sudo update-grub + ubuntu_finalize echo "SUCCESS!" |