forked from pool/systemd
Marcus Meissner
c6f712f5fa
- spec : remove --with-firmware-path, firmware loader was removed in v217 - spec: remove --disable-multi-seat-x, gone.(fixed in xorg) - spec: Do not enable systemd-readahead-collect.service and systemd-readahead-replay.service as these do not exist anymore. - spec: drop timedate-add-support-for-openSUSE-version-of-etc-sysconfig.patch Yast was fixed to write all timezone changes exactly how timedated expects things to be done. - spec: remove handle-etc-HOSTNAME.patch, since late 2014 the netcfg package handles the migration from /etc/HOSTNAME to /etc/hostname and owns both files. -spec: remove boot.udev and systemd-journald.init as they currently serve no purpose. - suse-sysv-bootd-support.diff: Remove HAVE_SYSVINIT conditions, we are in sysvcompat-only codepath, also remove the code targetting other distributions, never compiled as the TARGET_$DISTRO macros are never defined. - systemd-powerd-initctl-support.patch guard with HAVE_SYSV_COMPAT - set-and-use-default-logconsole.patch: fix HAVE_SYSV_COMPAT guards - insserv-generator.patch: Only build when sysvcompat is enabled - vhangup-on-all-consoles.patch add a comment indicating this is a workaround for a kernel bug. - spec: Add option to allow disabling sysvinit compat at build time. - spec: Add option to enable resolved at build time. - spec: Remove all %ifs for !factory products, current systemd releases can neither be built nor installed in older products without upgrading several components of the base system. (removed: 1008-add-msft-compability-rules.patch was only for =< 13.1) - spec: remove all dummy "aliases" to /etc/init.d, that made sense only when those init scripts still existed. (dummy localfs.service source: gone) - systemd-sleep-grub: moved to the grub2 package where it belongs as a suspend/resume hook (SR#286533) (drops prepare-suspend-to-disk.patch) OBS-URL: https://build.opensuse.org/request/show/286574 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=856
87 lines
3.5 KiB
Diff
87 lines
3.5 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 | 26 +++++++++++++++++++++-----
|
|
1 file changed, 21 insertions(+), 5 deletions(-)
|
|
|
|
--- systemd-219.orig/src/sysv-generator/sysv-generator.c
|
|
+++ systemd-219/src/sysv-generator/sysv-generator.c
|
|
@@ -42,7 +42,8 @@
|
|
|
|
typedef enum RunlevelType {
|
|
RUNLEVEL_UP,
|
|
- RUNLEVEL_DOWN
|
|
+ RUNLEVEL_DOWN,
|
|
+ RUNLEVEL_SYSINIT,
|
|
} RunlevelType;
|
|
|
|
static const struct {
|
|
@@ -50,6 +51,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_RUNLEVEL2_TARGET, RUNLEVEL_UP },
|
|
@@ -65,7 +69,7 @@ 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 */
|
|
};
|
|
|
|
typedef struct SysvStub {
|
|
@@ -83,7 +87,7 @@ typedef struct SysvStub {
|
|
bool reload;
|
|
} SysvStub;
|
|
|
|
-const char *arg_dest = "/tmp";
|
|
+static const char *arg_dest = "/tmp";
|
|
|
|
static int add_symlink(const char *service, const char *where) {
|
|
_cleanup_free_ char *from = NULL, *to = NULL;
|
|
@@ -235,6 +239,10 @@ static bool usage_contains_reload(const
|
|
static char *sysv_translate_name(const char *name) {
|
|
char *r;
|
|
|
|
+ if (startswith(name, "boot."))
|
|
+ /* Drop SuSE-style boot. prefix */
|
|
+ name += 5;
|
|
+
|
|
r = new(char, strlen(name) + strlen(".service") + 1);
|
|
if (!r)
|
|
return NULL;
|
|
@@ -864,10 +872,10 @@ static int set_dependencies_from_rcnd(Lo
|
|
|
|
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);
|
|
if (r < 0)
|
|
@@ -878,7 +886,8 @@ static int set_dependencies_from_rcnd(Lo
|
|
goto finish;
|
|
|
|
} 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)
|