Marcus Meissner
3a9ea8f8a3
- Update to new upstream release 227+228 tested boot-on-cryptoroot OBS-URL: https://build.opensuse.org/request/show/345072 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=920
81 lines
3.2 KiB
Diff
81 lines
3.2 KiB
Diff
From: Frederic Crozat <fcrozat@suse.com>
|
|
Date: Fri, 12 Apr 2013 16:56:26 +0200
|
|
Subject: Revert "service: drop support for SysV scripts for the early boot"
|
|
|
|
This reverts commit 3cdebc217c42c8529086f2965319b6a48eaaeabe.
|
|
|
|
[Implementation note: currently, the unit is generated, but not
|
|
activated even if symlinks exist in boot.d. Hmmm... -jengelh@inai.de]
|
|
---
|
|
src/sysv-generator/sysv-generator.c | 20 +++++++++++++++-----
|
|
1 file changed, 15 insertions(+), 5 deletions(-)
|
|
|
|
Index: systemd-228/src/sysv-generator/sysv-generator.c
|
|
===================================================================
|
|
--- systemd-228.orig/src/sysv-generator/sysv-generator.c
|
|
+++ systemd-228/src/sysv-generator/sysv-generator.c
|
|
@@ -46,7 +46,8 @@
|
|
|
|
typedef enum RunlevelType {
|
|
RUNLEVEL_UP,
|
|
- RUNLEVEL_DOWN
|
|
+ RUNLEVEL_DOWN,
|
|
+ RUNLEVEL_SYSINIT,
|
|
} RunlevelType;
|
|
|
|
static const struct {
|
|
@@ -54,6 +55,9 @@ static const struct {
|
|
const char *target;
|
|
const RunlevelType type;
|
|
} rcnd_table[] = {
|
|
+ /* SUSE style boot.d */
|
|
+ { "boot.d", SPECIAL_SYSINIT_TARGET, RUNLEVEL_SYSINIT },
|
|
+
|
|
/* Standard SysV runlevels for start-up */
|
|
{ "rc1.d", SPECIAL_RESCUE_TARGET, RUNLEVEL_UP },
|
|
{ "rc2.d", SPECIAL_MULTI_USER_TARGET, RUNLEVEL_UP },
|
|
@@ -69,10 +73,10 @@ static const struct {
|
|
directories in this order, and we want to make sure that
|
|
sysv_start_priority is known when we first load the
|
|
unit. And that value we only know from S links. Hence
|
|
- UP must be read before DOWN */
|
|
+ UP/SYSINIT must be read before DOWN */
|
|
};
|
|
|
|
-const char *arg_dest = "/tmp";
|
|
+static const char *arg_dest = "/tmp";
|
|
|
|
typedef struct SysvStub {
|
|
char *name;
|
|
@@ -261,6 +265,10 @@ static char *sysv_translate_name(const c
|
|
_cleanup_free_ char *c = NULL;
|
|
char *res;
|
|
|
|
+ if (startswith(name, "boot."))
|
|
+ /* Drop SuSE-style boot. prefix */
|
|
+ name += 5;
|
|
+
|
|
c = strdup(name);
|
|
if (!c)
|
|
return NULL;
|
|
@@ -882,7 +890,8 @@ static int set_dependencies_from_rcnd(co
|
|
|
|
if (de->d_name[0] == 'S') {
|
|
|
|
- if (rcnd_table[i].type == RUNLEVEL_UP)
|
|
+ if (rcnd_table[i].type == RUNLEVEL_UP ||
|
|
+ rcnd_table[i].type == RUNLEVEL_SYSINIT)
|
|
service->sysv_start_priority = MAX(a*10 + b, service->sysv_start_priority);
|
|
|
|
r = set_ensure_allocated(&runlevel_services[i], NULL);
|
|
@@ -898,7 +907,8 @@ static int set_dependencies_from_rcnd(co
|
|
}
|
|
|
|
} else if (de->d_name[0] == 'K' &&
|
|
- (rcnd_table[i].type == RUNLEVEL_DOWN)) {
|
|
+ (rcnd_table[i].type == RUNLEVEL_DOWN ||
|
|
+ rcnd_table[i].type == RUNLEVEL_SYSINIT)) {
|
|
|
|
r = set_ensure_allocated(&shutdown_services, NULL);
|
|
if (r < 0) {
|