SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unit: when reading description from LSB prefer short over long description

Browse Source
This commit is contained in:
Lennart Poettering
2010-07-07 02:21:42 +02:00
parent 9aab5a731d
commit ed4c1cc672
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/service.c
+8 -7
View File
@@ -457,7 +457,8 @@ static int service_load_sysv_path(Service *s, const char *path) {
s->sysv_runlevels = d;
}
} else if (startswith_no_case(t, "description:")) {
} else if (startswith_no_case(t, "description:") &&
!u->meta.description) {
size_t k = strlen(t);
char *d;
@@ -603,9 +604,13 @@ static int service_load_sysv_path(Service *s, const char *path) {
s->sysv_runlevels = d;
}
} else if (startswith_no_case(t, "Description:")) {
} else if (startswith_no_case(t, "Description:") &&
!u->meta.description) {
char *d;
/* We use the long description only if
* no short description is set. */
state = LSB_DESCRIPTION;
if (!(d = strdup(strstrip(t+12)))) {
@@ -616,13 +621,9 @@ static int service_load_sysv_path(Service *s, const char *path) {
free(u->meta.description);
u->meta.description = d;
} else if (startswith_no_case(t, "Short-Description:") &&
!u->meta.description) {
} else if (startswith_no_case(t, "Short-Description:")) {
char *d;
/* We use the short description only
* if no long description is set. */
state = LSB;
if (!(d = strdup(strstrip(t+18)))) {