| Index: trunk/ubuntu/autoinstall/scripts/late_command |
| — | — | @@ -3,17 +3,18 @@ |
| 4 | 4 | set -e |
| 5 | 5 | set -x |
| 6 | 6 | |
| 7 | | -# Install wikimedia-base which pulls in a lot of other stuff, and |
| 8 | | -# openssh-server just to be sure |
| 9 | | -apt-install wikimedia-base openssh-server |
| 10 | | - |
| 11 | 7 | # Install the public root ssh key |
| 12 | 8 | mkdir /target/root/.ssh |
| 13 | 9 | wget -O /target/root/.ssh/authorized_keys http://apt.wikimedia.org/autoinstall/ssh/authorized_keys |
| 14 | 10 | chmod go-rwx /target/root/.ssh/authorized_keys |
| 15 | 11 | |
| | 12 | +# Install wikimedia-base which pulls in a lot of other stuff, and |
| | 13 | +# openssh-server just to be sure |
| | 14 | +apt-install wikimedia-base openssh-server puppet |
| | 15 | + |
| 16 | 16 | # Enable serial console (this has changed in Edgy with upstart) |
| 17 | | -if [ -f /target/etc/inittab ] |
| | 17 | +SUITE=$(debconf-get mirror/suite) |
| | 18 | +if [ "$SUITE" = "hardy" && -f /target/etc/inittab ] |
| 18 | 19 | then |
| 19 | 20 | # Do not let Ubuntu installer disable the console |
| 20 | 21 | rm -f /usr/lib/prebaseconfig.d/90console |