You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
41 lines
1.3 KiB
41 lines
1.3 KiB
7 years ago
|
From 95ee3c8f1ef9408543c962af5f21e01ccef544e1 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Michal Sekletar <msekleta@redhat.com>
|
||
|
|
Date: Thu, 7 Sep 2017 15:46:24 +0200
|
||
|
|
Subject: [PATCH] tmpfiles: warn if we get an argument on lines that don't take
|
||
|
|
any
|
||
|
|
|
||
|
|
(cherry picked from commit c82500c6fb37a25bc3c4b1e0be11a90a395619d9)
|
||
|
|
|
||
|
|
Related: #1299714
|
||
|
|
---
|
||
|
|
src/tmpfiles/tmpfiles.c | 9 +++++++--
|
||
|
|
1 file changed, 7 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
|
||
|
|
index 800e620bc..70e0cc2fa 100644
|
||
|
|
--- a/src/tmpfiles/tmpfiles.c
|
||
|
|
+++ b/src/tmpfiles/tmpfiles.c
|
||
|
|
@@ -1788,8 +1788,6 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
|
||
|
|
|
||
|
|
switch (i.type) {
|
||
|
|
|
||
|
|
- case CREATE_FILE:
|
||
|
|
- case TRUNCATE_FILE:
|
||
|
|
case CREATE_DIRECTORY:
|
||
|
|
case CREATE_SUBVOLUME:
|
||
|
|
case EMPTY_DIRECTORY:
|
||
|
|
@@ -1802,6 +1800,13 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
|
||
|
|
case ADJUST_MODE:
|
||
|
|
case RELABEL_PATH:
|
||
|
|
case RECURSIVE_RELABEL_PATH:
|
||
|
|
+ if (i.argument)
|
||
|
|
+ log_warning("[%s:%u] %c lines don't take argument field, ignoring.", fname, line, i.type);
|
||
|
|
+
|
||
|
|
+ break;
|
||
|
|
+
|
||
|
|
+ case CREATE_FILE:
|
||
|
|
+ case TRUNCATE_FILE:
|
||
|
|
break;
|
||
|
|
|
||
|
|
case CREATE_SYMLINK:
|