Re: [systemd-devel] [PATCH v9002 2/2] man: remove timezone(5) and add localtime(5)

2012-09-14 Thread Lennart Poettering
On Tue, 21.08.12 23:11, Shawn Landden (shawnland...@gmail.com) wrote:

Applied both. Finally. Sorry for the delay.
 ---
  Makefile.am|2 +-
  man/localtime.xml  |   93 
 
  man/timezone.xml   |   90 --
  units/systemd-timedated.service.in |2 +-
  4 files changed, 95 insertions(+), 92 deletions(-)
  create mode 100644 man/localtime.xml
  delete mode 100644 man/timezone.xml
 
 diff --git a/Makefile.am b/Makefile.am
 index e6bfc1f..1996956 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -468,7 +468,7 @@ MANPAGES = \
   man/systemd.conf.5 \
   man/tmpfiles.d.5 \
   man/hostname.5 \
 - man/timezone.5 \
 + man/localtime.5 \
   man/machine-id.5 \
   man/locale.conf.5 \
   man/os-release.5 \
 diff --git a/man/localtime.xml b/man/localtime.xml
 new file mode 100644
 index 000..09df161
 --- /dev/null
 +++ b/man/localtime.xml
 @@ -0,0 +1,93 @@
 +?xml version='1.0'? !--*-nxml-*--
 +?xml-stylesheet type=text/xsl 
 href=http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl;?
 +!DOCTYPE refentry PUBLIC -//OASIS//DTD DocBook XML V4.2//EN
 +http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd;
 +
 +!--
 +  This file is part of systemd.
 +
 +  Copyright 2010 Lennart Poettering
 +  Copyright 2012 Shawn Landden
 +
 +  systemd is free software; you can redistribute it and/or modify it
 +  under the terms of the GNU Lesser General Public License as published by
 +  the Free Software Foundation; either version 2.1 of the License, or
 +  (at your option) any later version.
 +
 +  systemd is distributed in the hope that it will be useful, but
 +  WITHOUT ANY WARRANTY; without even the implied warranty of
 +  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 +  Lesser General Public License for more details.
 +
 +  You should have received a copy of the GNU Lesser General Public License
 +  along with systemd; If not, see http://www.gnu.org/licenses/.
 +--
 +
 +refentry id=localtime
 +refentryinfo
 +title/etc/localtime/title
 +productnamesystemd/productname
 +
 +authorgroup
 +author
 +contribDeveloper/contrib
 +firstnameLennart/firstname
 +surnamePoettering/surname
 +emaillenn...@poettering.net/email
 +/author
 +author
 +contribDeveloper/contrib
 +firstnameShawn/firstname
 +surnameLandden/surname
 +emailshawnland...@gmail.com/email
 +/author
 +/authorgroup
 +/refentryinfo
 +
 +refmeta
 +refentrytitlelocaltime/refentrytitle
 +manvolnum5/manvolnum
 +/refmeta
 +
 +refnamediv
 +refnamelocaltime/refname
 +refpurposeLocal time zone configuration file/refpurpose
 +/refnamediv
 +
 +refsynopsisdiv
 +parafilename/etc/localtime/filename - 
 filename/usr/share/zoneinfo/…/filename/para
 +/refsynopsisdiv
 +
 +refsect1
 +titleDescription/title
 +
 +paraThe filename/etc/localtime/filename file
 +configures the system-wide time zone of the local
 +system that is used by applications for presentation
 +to the user. It should be an absolute symbolic link
 +with a destination of 
 filename/usr/share/zoneinfo//filename,
 +fallowed by a time zone identifier such as
 +literalEurope/Berlin/literal or 
 literalEtc/UTC/literal.
 +The resulting link should point to the corresponding binary
 +
 citerefentryrefentrytitletzfile/refentrytitlemanvolnum5/manvolnum/citerefentry
 +time zone data for the configured time zone./para
 +
 +paraAs the time zone identifier is extracted from the name 
 of
 +the target of filename/etc/localtime/filename this file 
 may
 +not be a normal file or hardlink./para
 +
 +paraThe time zone may be overridden for individual
 +programs by using the TZ environment variable. See
 +
 citerefentryrefentrytitleenviron/refentrytitlemanvolnum7/manvolnum/citerefentry./para
 +/refsect1
 +
 +refsect1
 +  titleSee Also/title
 +  para
 +  
 citerefentryrefentrytitletzset/refentrytitlemanvolnum3/manvolnum/citerefentry
 +  
 citerefentryrefentrytitlelocaltime/refentrytitlemanvolnum3/manvolnum/citerefentry
 +   

Re: [systemd-devel] [PATCH v9002 2/2] man: remove timezone(5) and add localtime(5)

2012-09-14 Thread Lennart Poettering
On Fri, 14.09.12 19:28, Lennart Poettering (lenn...@poettering.net) wrote:

 On Tue, 21.08.12 23:11, Shawn Landden (shawnland...@gmail.com) wrote:
 
 Applied both. Finally. Sorry for the delay.

So, after commiting this I thought a bit more about this and made a
couple of additional changes:

- I did introduce symlink_atomic() after all, since symlinks can't
  otherwise be overwritten atomically this does make sense after
  all. Sorry for the confusion about this earlier.

- I made handling of /etc/timezone a Debian-only thing now

- I changed the code generate a relative symlink rather than an absolute
  one. People dealing with OS subtrees will like this

I am quite happy with the new state of affairs I must say.

Lennart

-- 
Lennart Poettering - Red Hat, Inc.
___
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel


[systemd-devel] [PATCH v9002 2/2] man: remove timezone(5) and add localtime(5)

2012-08-22 Thread Shawn Landden
---
 Makefile.am|2 +-
 man/localtime.xml  |   93 
 man/timezone.xml   |   90 --
 units/systemd-timedated.service.in |2 +-
 4 files changed, 95 insertions(+), 92 deletions(-)
 create mode 100644 man/localtime.xml
 delete mode 100644 man/timezone.xml

diff --git a/Makefile.am b/Makefile.am
index e6bfc1f..1996956 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -468,7 +468,7 @@ MANPAGES = \
man/systemd.conf.5 \
man/tmpfiles.d.5 \
man/hostname.5 \
-   man/timezone.5 \
+   man/localtime.5 \
man/machine-id.5 \
man/locale.conf.5 \
man/os-release.5 \
diff --git a/man/localtime.xml b/man/localtime.xml
new file mode 100644
index 000..09df161
--- /dev/null
+++ b/man/localtime.xml
@@ -0,0 +1,93 @@
+?xml version='1.0'? !--*-nxml-*--
+?xml-stylesheet type=text/xsl 
href=http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl;?
+!DOCTYPE refentry PUBLIC -//OASIS//DTD DocBook XML V4.2//EN
+http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd;
+
+!--
+  This file is part of systemd.
+
+  Copyright 2010 Lennart Poettering
+  Copyright 2012 Shawn Landden
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with systemd; If not, see http://www.gnu.org/licenses/.
+--
+
+refentry id=localtime
+refentryinfo
+title/etc/localtime/title
+productnamesystemd/productname
+
+authorgroup
+author
+contribDeveloper/contrib
+firstnameLennart/firstname
+surnamePoettering/surname
+emaillenn...@poettering.net/email
+/author
+author
+contribDeveloper/contrib
+firstnameShawn/firstname
+surnameLandden/surname
+emailshawnland...@gmail.com/email
+/author
+/authorgroup
+/refentryinfo
+
+refmeta
+refentrytitlelocaltime/refentrytitle
+manvolnum5/manvolnum
+/refmeta
+
+refnamediv
+refnamelocaltime/refname
+refpurposeLocal time zone configuration file/refpurpose
+/refnamediv
+
+refsynopsisdiv
+parafilename/etc/localtime/filename - 
filename/usr/share/zoneinfo/…/filename/para
+/refsynopsisdiv
+
+refsect1
+titleDescription/title
+
+paraThe filename/etc/localtime/filename file
+configures the system-wide time zone of the local
+system that is used by applications for presentation
+to the user. It should be an absolute symbolic link
+with a destination of 
filename/usr/share/zoneinfo//filename,
+fallowed by a time zone identifier such as
+literalEurope/Berlin/literal or literalEtc/UTC/literal.
+The resulting link should point to the corresponding binary
+
citerefentryrefentrytitletzfile/refentrytitlemanvolnum5/manvolnum/citerefentry
+time zone data for the configured time zone./para
+
+paraAs the time zone identifier is extracted from the name of
+the target of filename/etc/localtime/filename this file may
+not be a normal file or hardlink./para
+
+paraThe time zone may be overridden for individual
+programs by using the TZ environment variable. See
+
citerefentryrefentrytitleenviron/refentrytitlemanvolnum7/manvolnum/citerefentry./para
+/refsect1
+
+refsect1
+  titleSee Also/title
+  para
+  
citerefentryrefentrytitletzset/refentrytitlemanvolnum3/manvolnum/citerefentry
+  
citerefentryrefentrytitlelocaltime/refentrytitlemanvolnum3/manvolnum/citerefentry
+  
citerefentryrefentrytitlesystemd/refentrytitlemanvolnum1/manvolnum/citerefentry
+  /para
+/refsect1
+
+/refentry
diff --git a/man/timezone.xml b/man/timezone.xml
deleted file mode 100644
index