Browse Source

update-rc.d: Take and modify the angstrom systemd patch

Do not attempt to start/stop the application as part of the upgrade.
This might conflict with systemd .service files that override the
LSB script. The path of systemd has changed so the path was updated
in the script. A better fix would check if the systemd cgroup is mounted
as this is a better indicator for systemd.
hfreyther/master-next
Holger Hans Peter Freyther 9 years ago
committed by Holger Hans Peter Freyther
parent
commit
e1acffbebc
  1. 27
      recipes-fixes/update-rc.d/files/0001-update-rc.d-make-s-a-noop-when-systemd-is-present.patch
  2. 5
      recipes-fixes/update-rc.d/update-rc.d_angstrom.inc
  3. 1
      yocto-master/update-rc.d_0.7.bbappend

27
recipes-fixes/update-rc.d/files/0001-update-rc.d-make-s-a-noop-when-systemd-is-present.patch

@ -0,0 +1,27 @@
From e7aa29008b55962fbfcf374391fa8bb5f8737c11 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Tue, 18 Oct 2011 13:44:56 +0200
Subject: [PATCH] update-rc.d: make -s a noop when systemd is present
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
update-rc.d | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/update-rc.d b/update-rc.d
index 5e32902..d646abc 100644
--- a/update-rc.d
+++ b/update-rc.d
@@ -115,7 +115,9 @@ while [ $# -gt 0 ]; do
shift
continue
;;
- -s) dostart=1
+ -s) if [ ! -e /lib/systemd/systemd ] ; then
+ dostart=1
+ fi
shift
continue
;;
--
1.6.6.1

5
recipes-fixes/update-rc.d/update-rc.d_angstrom.inc

@ -0,0 +1,5 @@
FILESEXTRAPATHS := "${THISDIR}/files"
SRC_URI += "file://0001-update-rc.d-make-s-a-noop-when-systemd-is-present.patch"
PRINC = "3"

1
yocto-master/update-rc.d_0.7.bbappend

@ -0,0 +1 @@
require recipes-fixes/${PN}/${PN}_angstrom.inc
Loading…
Cancel
Save