Linux Archive

Linux Archive (http://www.linux-archive.org/)
-   CentOS (http://www.linux-archive.org/centos/)
-   -   Move dependency info into the unit files (http://www.linux-archive.org/centos/578182-move-dependency-info-into-unit-files.html)

Will Woods 09-20-2011 10:19 PM

Move dependency info into the unit files
 
---
data/systemd/Makefile.am | 10 +---------
data/systemd/anaconda.target | 2 +-
data/systemd/loader.service | 4 ++--
3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/data/systemd/Makefile.am b/data/systemd/Makefile.am
index 2042981..196e90d 100644
--- a/data/systemd/Makefile.am
+++ b/data/systemd/Makefile.am
@@ -17,14 +17,6 @@
#
# Author: Chris Lumens <clumens@redhat.com>

-systemddir = /lib/systemd/system
+systemddir = /lib/systemd/system
dist_systemd_DATA = anaconda-shell.service anaconda.target loader.service instperf.service tmp.mount
-
MAINTAINERCLEANFILES = Makefile.in
-
-install-exec-local:
- mkdir -p $(DESTDIR)/lib/systemd/system/anaconda.target.wants
- ln -sf /lib/systemd/system/anaconda-shell.service $(DESTDIR)/lib/systemd/system/anaconda.target.wants
- ln -sf /lib/systemd/system/loader.service $(DESTDIR)/lib/systemd/system/anaconda.target.wants
- ln -sf /lib/systemd/system/rsyslog.service $(DESTDIR)/lib/systemd/system/anaconda.target.wants
- ln -sf /lib/systemd/system/udev-settle.service $(DESTDIR)/lib/systemd/system/anaconda.target.wants
diff --git a/data/systemd/anaconda.target b/data/systemd/anaconda.target
index ac6d6e1..844999e 100644
--- a/data/systemd/anaconda.target
+++ b/data/systemd/anaconda.target
@@ -4,4 +4,4 @@ Requires=basic.target
Conflicts=rescue.service rescue.target
After=basic.target rescue.service rescue.target
AllowIsolate=yes
-Wants=anaconda-shell@tty2.service anaconda-shell@hvc1.service
+Wants=loader.service anaconda-shell@tty2.service anaconda-shell@hvc1.service
diff --git a/data/systemd/loader.service b/data/systemd/loader.service
index 81c43b5..b6d9f43 100644
--- a/data/systemd/loader.service
+++ b/data/systemd/loader.service
@@ -1,7 +1,7 @@
[Unit]
Description=The anaconda loader
-Wants=instperf.service tmp.mount
-After=instperf.service tmp.mount
+Wants=instperf.service rsyslog.service udev-settle.service
+After=instperf.service rsyslog.service udev-settle.service

[Service]
Environment=HOME=/root MALLOC_CHECK_=2 MALLOC_PERTURB_=204 PATH=/usr/bin:/bin:/sbin:/usr/sbin:/mnt/sysimage/bin:/mnt/sysimage/usr/bin:/mnt/sysimage/usr/sbin:/mnt/sysimage/sbin PYTHONPATH=/tmp/updates TERM=linux
--
1.7.6.2

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

Ales Kozumplik 09-21-2011 06:00 AM

Move dependency info into the unit files
 
On 09/21/2011 12:19 AM, Will Woods wrote:

---
data/systemd/Makefile.am | 10 +---------
data/systemd/anaconda.target | 2 +-
data/systemd/loader.service | 4 ++--
3 files changed, 4 insertions(+), 12 deletions(-)



Problems with sysmted are notoriously hard to debug so please make sure
it works (i.e. you see it run fine without the symlinks) before pushing
this set (and the other sysmted set).


Ales

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

Chris Lumens 09-21-2011 02:00 PM

Move dependency info into the unit files
 
> data/systemd/Makefile.am | 10 +---------
> data/systemd/anaconda.target | 2 +-
> data/systemd/loader.service | 4 ++--
> 3 files changed, 4 insertions(+), 12 deletions(-)

These also look reasonable.

- Chris

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

Will Woods 09-21-2011 02:53 PM

Move dependency info into the unit files
 
On Wed, 2011-09-21 at 08:00 +0200, Ales Kozumplik wrote:
> On 09/21/2011 12:19 AM, Will Woods wrote:
> > ---
> > data/systemd/Makefile.am | 10 +---------
> > data/systemd/anaconda.target | 2 +-
> > data/systemd/loader.service | 4 ++--
> > 3 files changed, 4 insertions(+), 12 deletions(-)
> >
>
> Problems with sysmted are notoriously hard to debug so please make sure
> it works (i.e. you see it run fine without the symlinks) before pushing
> this set (and the other sysmted set).

Good point! I did test this on x86_64 with an updates.img that replaced
the existing service files, and it worked fine.

-w

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list


All times are GMT. The time now is 08:14 PM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.