chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
treewide: auto-convert the simple cases to log_*_errno()
[elogind.git]
/
src
/
update-done
/
update-done.c
diff --git
a/src/update-done/update-done.c
b/src/update-done/update-done.c
index 10ba85ca924ca97ec3673dc84332ee87ddaaa07b..07e87b0c0802bac7c4d494b66d4c8a20653770e5 100644
(file)
--- a/
src/update-done/update-done.c
+++ b/
src/update-done/update-done.c
@@
-20,6
+20,12
@@
***/
#include "util.h"
***/
#include "util.h"
+#include "label.h"
+
+#define MESSAGE \
+ "This file was created by systemd-update-done. Its only \n" \
+ "purpose is to hold a timestamp of the time this directory\n" \
+ "was updated. See systemd-update-done.service(8).\n"
static int apply_timestamp(const char *path, struct timespec *ts) {
struct timespec twice[2];
static int apply_timestamp(const char *path, struct timespec *ts) {
struct timespec twice[2];
@@
-51,10
+57,20
@@
static int apply_timestamp(const char *path, struct timespec *ts) {
} else if (errno == ENOENT) {
_cleanup_close_ int fd = -1;
} else if (errno == ENOENT) {
_cleanup_close_ int fd = -1;
+ int r;
/* The timestamp file doesn't exist yet? Then let's create it. */
/* The timestamp file doesn't exist yet? Then let's create it. */
+ r = mac_selinux_create_file_prepare(path, S_IFREG);
+ if (r < 0) {
+ log_error("Failed to set SELinux context for %s: %s",
+ path, strerror(-r));
+ return r;
+ }
+
fd = open(path, O_CREAT|O_EXCL|O_WRONLY|O_TRUNC|O_CLOEXEC|O_NOCTTY|O_NOFOLLOW, 0644);
fd = open(path, O_CREAT|O_EXCL|O_WRONLY|O_TRUNC|O_CLOEXEC|O_NOCTTY|O_NOFOLLOW, 0644);
+ mac_selinux_create_file_clear();
+
if (fd < 0) {
if (errno == EROFS) {
if (fd < 0) {
if (errno == EROFS) {
@@
-66,6
+82,8
@@
static int apply_timestamp(const char *path, struct timespec *ts) {
return -errno;
}
return -errno;
}
+ (void) loop_write(fd, MESSAGE, strlen(MESSAGE), false);
+
twice[0] = *ts;
twice[1] = *ts;
twice[0] = *ts;
twice[1] = *ts;
@@
-83,7
+101,7
@@
static int apply_timestamp(const char *path, struct timespec *ts) {
int main(int argc, char *argv[]) {
struct stat st;
int main(int argc, char *argv[]) {
struct stat st;
- int r, q;
+ int r, q
= 0
;
log_set_target(LOG_TARGET_AUTO);
log_parse_environment();
log_set_target(LOG_TARGET_AUTO);
log_parse_environment();
@@
-94,11
+112,15
@@
int main(int argc, char *argv[]) {
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
- r = apply_timestamp("/etc/.updated", &st.st_mtim);
+ r = mac_selinux_init(NULL);
+ if (r < 0) {
+ log_error_errno(-r, "SELinux setup failed: %m");
+ goto finish;
+ }
+ r = apply_timestamp("/etc/.updated", &st.st_mtim);
q = apply_timestamp("/var/.updated", &st.st_mtim);
q = apply_timestamp("/var/.updated", &st.st_mtim);
- if (q < 0 && r == 0)
- r = q;
- return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
+finish:
+ return r < 0 || q < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
}
}