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.

7 files changed, 9 insertions, 8 deletions

diff --git a/Makefile.am b/Makefile.am
index 160acfb9cf..2f08ceb173 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 aea00d2235..470e60f4ea 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 804504a833..efc4c32bed 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 a297cd9117..7f8d005f00 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 6cedf18c03..08dae11a25 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 51f255e2ab..f278a671a3 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/time-sync.target
index df4c40298c..aa34ecb5f4 100644
--- a/units/rtc-set.target
+++ b/units/time-sync.target
@@ -11,4 +11,4 @@
 # implementations lacking socket/bus activation.
 
 [Unit]
-Description=RTC Set
+Description=System Time Synchronized