[systemd-commits] Makefile.am man/systemd.special.xml.in src/service.c src/special.h TODO units/hwclock-load.service units/rtc-set.target units/time-sync.target
Lennart Poettering
lennart at kemper.freedesktop.org
Wed Apr 6 10:19:48 PDT 2011
Makefile.am | 2 +-
TODO | 2 +-
man/systemd.special.xml.in | 4 ++--
src/service.c | 2 +-
src/special.h | 2 +-
units/hwclock-load.service | 3 ++-
units/rtc-set.target | 14 --------------
units/time-sync.target | 14 ++++++++++++++
8 files changed, 22 insertions(+), 21 deletions(-)
New commits:
commit 4466194c43a25bc51b21226f04245131e698bb3f
Author: Lennart Poettering <lennart at poettering.net>
Date: Wed Apr 6 19:18:11 2011 +0200
units: rename rtc-set.target to time-sync.target and pull it in by hwclock-load.service
On request of Miroslav Lichvar, rename rtc-set.target to
time-sync.target since usually the RTC chip isn't involved at all in NTP
syncs.
Also, pull it in by hwclock-load.service.
diff --git a/Makefile.am b/Makefile.am
index 160acfb..2f08ceb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -232,7 +232,7 @@ dist_systemunit_DATA = \
units/reboot.target \
units/rescue.target \
units/rpcbind.target \
- units/rtc-set.target \
+ units/time-sync.target \
units/shutdown.target \
units/final.target \
units/umount.target \
diff --git a/TODO b/TODO
index aea00d2..470e60f 100644
--- a/TODO
+++ b/TODO
@@ -10,7 +10,7 @@ F15:
* NM should pull in network.target (PENDING)
https://bugzilla.redhat.com/show_bug.cgi?id=692008
-* ntpd should pull in rtc-set.target. (PENDING)
+* ntpd should pull in time-sync.target. (PENDING)
* add fstab fields to add wait timeouts, change Wants to Requires by local-fs.target
diff --git a/man/systemd.special.xml.in b/man/systemd.special.xml.in
index 804504a..efc4c32 100644
--- a/man/systemd.special.xml.in
+++ b/man/systemd.special.xml.in
@@ -68,7 +68,7 @@
<filename>remote-fs.target</filename>,
<filename>rescue.target</filename>,
<filename>rpcbind.target</filename>,
- <filename>rtc-set.target</filename>,
+ <filename>time-sync.target</filename>,
<filename>runlevel2.target</filename>,
<filename>runlevel3.target</filename>,
<filename>runlevel4.target</filename>,
@@ -399,7 +399,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><filename>rtc-set.target</filename></term>
+ <term><filename>time-sync.target</filename></term>
<listitem>
<para>systemd automatically
adds dependencies of type
diff --git a/src/service.c b/src/service.c
index a297cd9..7f8d005 100644
--- a/src/service.c
+++ b/src/service.c
@@ -286,7 +286,7 @@ static int sysv_translate_facility(const char *name, const char *filename, char
"portmap", SPECIAL_RPCBIND_TARGET,
"remote_fs", SPECIAL_REMOTE_FS_TARGET,
"syslog", SPECIAL_SYSLOG_TARGET,
- "time", SPECIAL_RTC_SET_TARGET,
+ "time", SPECIAL_TIME_SYNC_TARGET,
/* common extensions */
"mail-transfer-agent", SPECIAL_MAIL_TRANSFER_AGENT_TARGET,
diff --git a/src/special.h b/src/special.h
index 6cedf18..08dae11 100644
--- a/src/special.h
+++ b/src/special.h
@@ -54,7 +54,7 @@
#define SPECIAL_NSS_LOOKUP_TARGET "nss-lookup.target" /* LSB's $named */
#define SPECIAL_RPCBIND_TARGET "rpcbind.target" /* LSB's $portmap */
#define SPECIAL_SYSLOG_TARGET "syslog.target" /* LSB's $syslog; Should pull in syslog.socket or syslog.service */
-#define SPECIAL_RTC_SET_TARGET "rtc-set.target" /* LSB's $time */
+#define SPECIAL_TIME_SYNC_TARGET "time-sync.target" /* LSB's $time */
#define SPECIAL_DISPLAY_MANAGER_SERVICE "display-manager.service" /* Debian's $x-display-manager */
#define SPECIAL_MAIL_TRANSFER_AGENT_TARGET "mail-transfer-agent.target" /* Debian's $mail-{transport|transfer-agent */
#define SPECIAL_HTTP_DAEMON_TARGET "http-daemon.target"
diff --git a/units/hwclock-load.service b/units/hwclock-load.service
index 51f255e..f278a67 100644
--- a/units/hwclock-load.service
+++ b/units/hwclock-load.service
@@ -8,9 +8,10 @@
[Unit]
Description=Apply System Clock UTC Offset
DefaultDependencies=no
+Wants=time-sync.target
Conflicts=shutdown.target
After=systemd-readahead-collect.service systemd-readahead-replay.service
-Before=sysinit.target shutdown.target udev.service
+Before=sysinit.target shutdown.target udev.service time-sync.target
[Service]
Type=oneshot
diff --git a/units/rtc-set.target b/units/rtc-set.target
deleted file mode 100644
index df4c402..0000000
--- a/units/rtc-set.target
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file is part of systemd.
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-
-# See systemd.special(7) for details
-
-# This exists mostly for compatibility with SysV/LSB units, and
-# implementations lacking socket/bus activation.
-
-[Unit]
-Description=RTC Set
diff --git a/units/time-sync.target b/units/time-sync.target
new file mode 100644
index 0000000..aa34ecb
--- /dev/null
+++ b/units/time-sync.target
@@ -0,0 +1,14 @@
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+# See systemd.special(7) for details
+
+# This exists mostly for compatibility with SysV/LSB units, and
+# implementations lacking socket/bus activation.
+
+[Unit]
+Description=System Time Synchronized
More information about the systemd-commits
mailing list