summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog3
-rw-r--r--en/using-d-i/modules/clock-setup-finish.xml2
-rw-r--r--en/using-d-i/modules/clock-setup.xml6
3 files changed, 8 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index dc5e22f64..f9898e8d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,13 +38,14 @@ installation-guide (2009xxxx) UNRELEASED; urgency=low
* Fix typo in chroot install appendix. Closes: #535494.
* Improve bootp documentation. Thanks to Holger Wansing for the patch.
Closes: #282614.
+ * On s390 the system clock is not modified by the installer.
[ Otavio Salvador ]
* Document the netcfg/enable preseeding that allows for disabling the
network configuration. Thanks to Anthony L. Awtrey <tony@awtrey.com>
for the patch.
- -- Frans Pop <fjp@debian.org> Thu, 09 Jul 2009 15:19:54 +0200
+ -- Frans Pop <fjp@debian.org> Sun, 02 Aug 2009 10:53:20 +0200
installation-guide (20090427) unstable; urgency=low
diff --git a/en/using-d-i/modules/clock-setup-finish.xml b/en/using-d-i/modules/clock-setup-finish.xml
index 8067fad26..2adcb04cf 100644
--- a/en/using-d-i/modules/clock-setup-finish.xml
+++ b/en/using-d-i/modules/clock-setup-finish.xml
@@ -1,7 +1,7 @@
<!-- retain these comments for translator revision tracking -->
<!-- $Id$ -->
- <sect3 id="system-clock">
+ <sect3 arch="not-s390" id="system-clock">
<title>Setting the System Clock</title>
<para>
diff --git a/en/using-d-i/modules/clock-setup.xml b/en/using-d-i/modules/clock-setup.xml
index 9d14f8604..83aa6f948 100644
--- a/en/using-d-i/modules/clock-setup.xml
+++ b/en/using-d-i/modules/clock-setup.xml
@@ -4,7 +4,7 @@
<sect3 id="clock-setup">
<title>Configuring the Clock</title>
-<para>
+<para arch="not-s390">
The installer will first attempt to connect to a time server on the
Internet (using the <firstterm>NTP</firstterm> protocol) in order to
@@ -13,6 +13,10 @@ will assume the time and date obtained from the system clock when the
installation system was booted are correct. It is not possible to manually
set the system time during the installation process.
+</para><para arch="s390">
+
+The installer does not modify the system clock on the s390 platform.
+
</para>
&module-tzsetup.xml;