http://www.mediawiki.org/wiki/Special:Code/MediaWiki/59591
Revision: 59591
Author: root
Date: 2009-11-30 18:31:57 +0000 (Mon, 30 Nov 2009)
Log Message:
-----------
Update late_command script for Ubuntu 9.10, and install puppet by default
Modified Paths:
--------------
trunk/ubuntu/autoinstall/scripts/late_command
Modified: trunk/ubuntu/autoinstall/scripts/late_command
===================================================================
--- trunk/ubuntu/autoinstall/scripts/late_command 2009-11-30 18:17:45 UTC
(rev 59590)
+++ trunk/ubuntu/autoinstall/scripts/late_command 2009-11-30 18:31:57 UTC
(rev 59591)
@@ -3,17 +3,18 @@
set -e
set -x
-# Install wikimedia-base which pulls in a lot of other stuff, and
-# openssh-server just to be sure
-apt-install wikimedia-base openssh-server
-
# Install the public root ssh key
mkdir /target/root/.ssh
wget -O /target/root/.ssh/authorized_keys
http://apt.wikimedia.org/autoinstall/ssh/authorized_keys
chmod go-rwx /target/root/.ssh/authorized_keys
+# Install wikimedia-base which pulls in a lot of other stuff, and
+# openssh-server just to be sure
+apt-install wikimedia-base openssh-server puppet
+
# Enable serial console (this has changed in Edgy with upstart)
-if [ -f /target/etc/inittab ]
+SUITE=$(debconf-get mirror/suite)
+if [ "$SUITE" = "hardy" && -f /target/etc/inittab ]
then
# Do not let Ubuntu installer disable the console
rm -f /usr/lib/prebaseconfig.d/90console
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
