picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

sd-id128: id128_write overwrites target file

Browse source
This commit is contained in:
Evgeny Vereshchagin 2016-12-13 11:45:01 +00:00
parent a6f72863ad
commit da2d142114
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libsystemd/sd-id128/id128-util.c
View file

@ -186,7 +186,7 @@ int id128_write_fd(int fd, Id128Format f, sd_id128_t id, bool do_sync) {
int id128_write(const char *p, Id128Format f, sd_id128_t id, bool do_sync) {
_cleanup_close_ int fd = -1;
fd = open(p, O_WRONLY|O_CREAT|O_CLOEXEC|O_NOCTTY, 0444);
fd = open(p, O_WRONLY|O_CREAT|O_CLOEXEC|O_NOCTTY|O_TRUNC, 0444);
if (fd < 0)
return -errno;

3
test/TEST-14-MACHINE-ID/test.sh
View file

@ -83,7 +83,8 @@ check expected "$r/etc/machine-id"
r="$(pwd)/transient-machine-id"
setup_root "$r"
touch "$r/etc/machine-id"
systemd-machine-id-setup --print --root "$r"
echo abc >>"$r/etc/machine-id"
mount -o remount,ro "$r"
mount -t tmpfs tmpfs "$r/run"
transient_id=$(systemd-machine-id-setup --print --root "$r")