X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fmachine-id-setup.c;h=d459afe900d11de3c3450457283a650610c509e5;hb=d38f6e34a618e2d100b06888e0810f776eb83510;hp=43720d628971103a928e613a9c8ae052a75c72e7;hpb=fe970a8a30d611d454cb40025cfc32e29efa34e6;p=elogind.git

diff --git a/src/core/machine-id-setup.c b/src/core/machine-id-setup.c
index 43720d628..d459afe90 100644
--- a/src/core/machine-id-setup.c
+++ b/src/core/machine-id-setup.c
@@ -78,7 +78,7 @@ static int generate(char id[34], const char *root) {
         fd = open(dbus_machine_id, O_RDONLY|O_CLOEXEC|O_NOCTTY|O_NOFOLLOW);
         if (fd >= 0) {
                 k = loop_read(fd, id, 33, false);
-                close_nointr_nofail(fd);
+                safe_close(fd);
 
                 if (k == 33 && id[32] == '\n') {
 
@@ -104,7 +104,7 @@ static int generate(char id[34], const char *root) {
                 fd = open("/sys/class/dmi/id/product_uuid", O_RDONLY|O_CLOEXEC|O_NOCTTY|O_NOFOLLOW);
                 if (fd >= 0) {
                         k = loop_read(fd, uuid, 36, false);
-                        close_nointr_nofail(fd);
+                        safe_close(fd);
 
                         if (k >= 36) {
                                 r = shorten_uuid(id, uuid);
@@ -216,8 +216,7 @@ int machine_id_setup(const char *root) {
                         return 0;
         }
 
-        close_nointr_nofail(fd);
-        fd = -1;
+        fd = safe_close(fd);
 
         /* Hmm, we couldn't write it? So let's write it to
          * /run/machine-id as a replacement */