mark at svn
Aug 27, 2008, 2:03 PM
Post #1 of 1
(77 views)
Permalink
|
|
SVN: [40106] trunk/ubuntu/autoinstall
|
|
Revision: 40106
Author: mark
Date: 2008-08-27 21:03:51 +0000 (Wed, 27 Aug 2008)
Log Message:
-----------
Fix occasional unassigned hostname problem, preseed NTP
Modified Paths:
--------------
trunk/ubuntu/autoinstall/knams.cfg
trunk/ubuntu/autoinstall/pmtpa-internal.cfg
trunk/ubuntu/autoinstall/pmtpa-squid.cfg
trunk/ubuntu/autoinstall/pmtpa.cfg
trunk/ubuntu/autoinstall/yaseo.cfg
Modified: trunk/ubuntu/autoinstall/knams.cfg
===================================================================
--- trunk/ubuntu/autoinstall/knams.cfg 2008-08-27 21:00:57 UTC (rev 40105)
+++ trunk/ubuntu/autoinstall/knams.cfg 2008-08-27 21:03:51 UTC (rev 40106)
@@ -11,8 +11,10 @@
d-i netcfg/get_nameservers string 91.198.174.6 208.80.152.131
d-i netcfg/confirm_static boolean true
-d-i netcfg/get_hostname string unassigned-hostname
-d-i netcfg/get_domain string unassigned-domain
+# get_domain should be set, get_hostname is overwritten by DHCP
+#d-i netcfg/get_hostname string unassigned-hostname
+d-i netcfg/get_domain string knams.wikimedia.org
+
d-i netcfg/wireless_wep string
### Mirror settings
@@ -24,6 +26,9 @@
d-i apt-setup/security_host string security.ubuntu.com
+# NTP
+d-i clock-setup/ntp-server string ntp.knams.wikimedia.org
+
# ssmtp settings
ssmtp ssmtp/mailhub string pascal.knams.wikimedia.org
ssmtp ssmtp/fromoverride boolean true
Modified: trunk/ubuntu/autoinstall/pmtpa-internal.cfg
===================================================================
--- trunk/ubuntu/autoinstall/pmtpa-internal.cfg 2008-08-27 21:00:57 UTC (rev 40105)
+++ trunk/ubuntu/autoinstall/pmtpa-internal.cfg 2008-08-27 21:03:51 UTC (rev 40106)
@@ -3,8 +3,9 @@
# Select interface that has a link
d-i netcfg/choose_interface select auto
-d-i netcfg/get_hostname string unassigned-hostname
-d-i netcfg/get_domain string unassigned-domain
+# get_domain should be set, get_hostname is overwritten by DHCP
+#d-i netcfg/get_hostname string unassigned-hostname
+d-i netcfg/get_domain string pmtpa.wmnet
d-i netcfg/disable_dhcp boolean true
# ip address is taken from DHCP, rest is set here
@@ -23,6 +24,9 @@
d-i apt-setup/security_host string security.ubuntu.com
d-i apt-setup/security-updates-failed note
+# NTP
+d-i clock-setup/ntp-server string ntp.pmtpa.wikimedia.org
+
# ssmtp settings
ssmtp ssmtp/mailhub string smtp.pmtpa.wmnet
ssmtp ssmtp/fromoverride boolean true
Modified: trunk/ubuntu/autoinstall/pmtpa-squid.cfg
===================================================================
--- trunk/ubuntu/autoinstall/pmtpa-squid.cfg 2008-08-27 21:00:57 UTC (rev 40105)
+++ trunk/ubuntu/autoinstall/pmtpa-squid.cfg 2008-08-27 21:03:51 UTC (rev 40106)
@@ -3,8 +3,9 @@
# Select interface that has a link
d-i netcfg/choose_interface select auto
-d-i netcfg/get_hostname string unassigned-hostname
-d-i netcfg/get_domain string unassigned-domain
+# get_domain should be set, get_hostname is overwritten by DHCP
+#d-i netcfg/get_hostname string unassigned-hostname
+d-i netcfg/get_domain string wikimedia.org
d-i netcfg/disable_dhcp boolean true
# ip address is taken from DHCP, rest is set here
Modified: trunk/ubuntu/autoinstall/pmtpa.cfg
===================================================================
--- trunk/ubuntu/autoinstall/pmtpa.cfg 2008-08-27 21:00:57 UTC (rev 40105)
+++ trunk/ubuntu/autoinstall/pmtpa.cfg 2008-08-27 21:03:51 UTC (rev 40106)
@@ -3,8 +3,9 @@
# Select interface that has a link
d-i netcfg/choose_interface select auto
-d-i netcfg/get_hostname string unassigned-hostname
-d-i netcfg/get_domain string unassigned-domain
+# get_domain should be set, get_hostname is overwritten by DHCP
+#d-i netcfg/get_hostname string unassigned-hostname
+d-i netcfg/get_domain string wikimedia.org
d-i netcfg/disable_dhcp boolean true
# ip address is taken from DHCP, rest is set here
@@ -22,6 +23,9 @@
d-i apt-setup/security_host string security.ubuntu.com
+# NTP
+d-i clock-setup/ntp-server string ntp.pmtpa.wikimedia.org
+
# ssmtp settings
ssmtp ssmtp/mailhub string smtp.pmtpa.wmnet
ssmtp ssmtp/fromoverride boolean true
Modified: trunk/ubuntu/autoinstall/yaseo.cfg
===================================================================
--- trunk/ubuntu/autoinstall/yaseo.cfg 2008-08-27 21:00:57 UTC (rev 40105)
+++ trunk/ubuntu/autoinstall/yaseo.cfg 2008-08-27 21:03:51 UTC (rev 40106)
@@ -10,8 +10,9 @@
d-i netcfg/get_nameservers string 203.212.189.251 208.80.152.131
d-i netcfg/confirm_static boolean true
-d-i netcfg/get_hostname string unassigned-hostname
-d-i netcfg/get_domain string unassigned-domain
+# get_domain should be set, get_hostname is overwritten by DHCP
+#d-i netcfg/get_hostname string unassigned-hostname
+d-i netcfg/get_domain string yaseo.wikimedia.org
d-i netcfg/wireless_wep string
### Mirror settings
@@ -22,6 +23,9 @@
d-i apt-setup/security_host string security.ubuntu.com
+# NTP
+d-i clock-setup/ntp-server string ntp.yaseo.wikimedia.org
+
# ssmtp settings
ssmtp ssmtp/mailhub string smtp.yaseo.wikimedia.org
ssmtp ssmtp/fromoverride boolean true
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS[at]lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
|
