diff options
| -rw-r--r-- | man/systemd.service.xml | 5 | ||||
| -rw-r--r-- | rules/60-persistent-storage.rules | 2 | ||||
| -rw-r--r-- | src/basic/util.c | 2 | ||||
| -rw-r--r-- | src/bootchart/svg.c | 4 |
4 files changed, 8 insertions, 5 deletions
diff --git a/man/systemd.service.xml b/man/systemd.service.xml index 1e949f0c52..4368ca8a19 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -226,7 +226,10 @@ services where <varname>Type=</varname> is set to <option>forking</option>. systemd will read the PID of the main process of the daemon after start-up of the service. - systemd will not write to the file configured here.</para> + systemd will not write to the file configured here, although + it will remove the file after the service has shut down if it + still exists. + </para> </listitem> </varlistentry> diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules index 71b8e46ae8..90b62cc490 100644 --- a/rules/60-persistent-storage.rules +++ b/rules/60-persistent-storage.rules @@ -6,7 +6,7 @@ ACTION=="remove", GOTO="persistent_storage_end" SUBSYSTEM!="block", GOTO="persistent_storage_end" -KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcache*", GOTO="persistent_storage_end" +KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcache*|cciss*", GOTO="persistent_storage_end" # ignore partitions that span the entire disk TEST=="whole_disk", GOTO="persistent_storage_end" diff --git a/src/basic/util.c b/src/basic/util.c index 727be56f58..906e4abad6 100644 --- a/src/basic/util.c +++ b/src/basic/util.c @@ -3627,7 +3627,7 @@ bool string_is_safe(const char *p) { if (*t > 0 && *t < ' ') return false; - if (strchr("\\\"\'\0x7f", *t)) + if (strchr("\\\"\'\x7f", *t)) return false; } diff --git a/src/bootchart/svg.c b/src/bootchart/svg.c index f442200b66..0ac1f55a91 100644 --- a/src/bootchart/svg.c +++ b/src/bootchart/svg.c @@ -76,8 +76,6 @@ static void svg_header(FILE *of, struct list_sample_data *head, double graph_sta assert(head); - sampledata = head; - LIST_FIND_TAIL(link, sampledata, head); sampledata_last = head; LIST_FOREACH_BEFORE(link, sampledata, head) { sampledata_last = sampledata; @@ -1296,6 +1294,8 @@ int svg_do(FILE *of, double offset = 7; int r, c; + sampledata = head; + LIST_FIND_TAIL(link, sampledata, head); ps = ps_first; /* count initcall thread count first */ |