shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-23 21:35:11 +03:00
Code

Merge pull request #30658 from jnohlgard/udevadm-lock-return-code

Browse Source 
udevadm: Propagate return code from verb result
This commit is contained in:
Yu Watanabe 2023-12-31 04:51:09 +09:00 committed by GitHub
commit e6bca18296
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/udev/udevadm-test-builtin.c
View File

@ -104,9 +104,12 @@ int builtin_main(int argc, char *argv[], void *userdata) {
}
r = udev_builtin_run(event, cmd, arg_command, true);
if (r < 0)
if (r < 0) {
log_debug_errno(r, "Builtin command '%s' fails: %m", arg_command);
goto finish;
}
r = 0;
finish:
udev_builtin_exit();
return r;

2
src/udev/udevadm.c
View File

@ -137,4 +137,4 @@ static int run(int argc, char *argv[]) {
return udevadm_main(argc, argv);
}
DEFINE_MAIN_FUNCTION(run);
DEFINE_MAIN_FUNCTION_WITH_POSITIVE_FAILURE(run);

13
test/units/testsuite-17.10.sh
View File

@ -238,4 +238,17 @@ assert_rc 124 timeout 5 udevadm wait --removed /sys/class/net/$netdev
udevadm wait --settle /sys/class/net/$netdev
udevadm wait -h
udevadm lock --help
udevadm lock --version
for i in /dev/block/*; do
udevadm lock --device "$i" --print
udevadm lock --device "$i" true
(! udevadm lock --device "$i" false)
done
for i in / /usr; do
udevadm lock --backing "$i" --print
udevadm lock --backing "$i" true
(! udevadm lock --backing "$i" false)
done
exit 0

5
test/units/testsuite-64.sh
View File

@ -396,6 +396,11 @@ EOF
udevadm control --reload
# initialize partition table
for disk in {0..9}; do
echo 'label: gpt' | udevadm lock --device="${devices[$disk]}" sfdisk -q "${devices[$disk]}"
done
# Delete the partitions, immediately recreate them, wait for udev to settle
# down, and then check if we have any dangling symlinks in /dev/disk/. Rinse
# and repeat.