github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-19 09:51:29 +00:00
Code Issues Projects Releases Wiki Activity

tests: Support systemd unit files in /usr/lib as well as /lib

Browse Source 
On Ubuntu 24.04, due to the /usr merge, system-provided unit files
now reside in `/usr/lib/systemd/system/` instead of `/lib/systemd/system/`.
For example, the command below now returns a different path:

```
$ systemctl show containerd.service -p FragmentPath
/usr/lib/systemd/system/containerd.service
```

Previously, on Ubuntu 22.04 and earlier, it returned:

```
/lib/systemd/system/containerd.service
```

The current pattern `if [[ $unit_file == /lib* ]]` fails to match the new path.
To ensure compatibility across versions, we update the pattern to match both
`/lib` and `/usr/lib` like:

```
if [[ $unit_file =~ ^/(usr/)?lib/ ]]
```

Signed-off-by: Hyounggyu Choi <Hyounggyu.Choi@ibm.com>
This commit is contained in:
Hyounggyu Choi 2025-02-19 14:34:59 +01:00
parent 73b7a3478c
commit a8363c28ca
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/common.bash
View File

@ -332,8 +332,8 @@ function restart_systemd_service_with_no_burst_limit() {
local unit_file=$(systemctl show "$service.service" -p FragmentPath | cut -d'=' -f2) local unit_file=$(systemctl show "$service.service" -p FragmentPath | cut -d'=' -f2)
[ -f "$unit_file" ] || { warn "Can't find $service's unit file: $unit_file"; return 1; } [ -f "$unit_file" ] || { warn "Can't find $service's unit file: $unit_file"; return 1; }
# If the unit file is in /lib, copy it to /etc # If the unit file is in /lib or /usr/lib, copy it to /etc
if [[ $unit_file == /lib* ]]; then if [[ $unit_file =~ ^/(usr/)?lib/ ]]; then
tmp_unit_file="/etc/${unit_file#*lib/}" tmp_unit_file="/etc/${unit_file#*lib/}"
sudo cp "$unit_file" "$tmp_unit_file" sudo cp "$unit_file" "$tmp_unit_file"
unit_file="$tmp_unit_file" unit_file="$tmp_unit_file"