| commit | 28b4e035efb3408c3acc76fc8acf9ac90bbdedec | [log] [tgz] |
|---|---|---|
| author | Meena Shanmugam <meenashanmugam@google.com> | Tue May 17 00:25:30 2022 +0000 |
| committer | Meena Shanmugam <meenashanmugam@google.com> | Tue May 17 19:05:53 2022 +0000 |
| tree | 2266bf2bd5896d0d3b74803a24dab66d006344d4 | |
| parent | f8e74b9b0c03a30e8c1861f72c13918d263b7ce5 [diff] |
project-lakitu: Use by-partlabel link for ESP partition. /dev/sda12 will not be present in ARM machines, which breaks cgroup_helper in ARM. Use /dev/disk/by-partlabel link instead of /dev/sda12. Fix lint error at line#117. BUG=b/232831046 TEST=Manual test, presubmit RELEASE_NOTE=None Change-Id: Ibb3808dcc692ae1063761d24cddfd60f48bd4fde Reviewed-on: https://cos-review.googlesource.com/c/cos/overlays/board-overlays/+/32844 Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com> Reviewed-by: Roy Yang <royyang@google.com>
diff --git a/project-lakitu/app-admin/cgroup-helper/cgroup-helper-0.0.1-r1.ebuild b/project-lakitu/app-admin/cgroup-helper/cgroup-helper-0.0.1-r2.ebuild similarity index 100% rename from project-lakitu/app-admin/cgroup-helper/cgroup-helper-0.0.1-r1.ebuild rename to project-lakitu/app-admin/cgroup-helper/cgroup-helper-0.0.1-r2.ebuild
diff --git a/project-lakitu/app-admin/cgroup-helper/files/cgroup_helper b/project-lakitu/app-admin/cgroup-helper/files/cgroup_helper index 5e9d8ed..5ccec62 100644 --- a/project-lakitu/app-admin/cgroup-helper/files/cgroup_helper +++ b/project-lakitu/app-admin/cgroup-helper/files/cgroup_helper
@@ -22,7 +22,7 @@ readonly PROG_NAME SECURE_BOOT_CMD="/usr/share/cloud/is-secure-boot" readonly SECURE_BOOT_CMD -ESP_PARTITION="/dev/sda12" +ESP_PARTITION="/dev/disk/by-partlabel/EFI-SYSTEM" readonly ESP_PARTITION PROC_CMDLINE="/proc/cmdline" readonly PROC_CMDLINE @@ -114,7 +114,8 @@ echo "Cgroup is already configured as 'unified'." exit 0 fi - local dir="$(mktemp -d)" + local dir + dir="$(mktemp -d)" mount "${ESP_PARTITION}" "${dir}" local search="systemd.unified_cgroup_hierarchy=false " search+="systemd.legacy_systemd_cgroup_controller=false"