| Index: trunk/ubuntu/autoinstall/common.cfg |
| — | — | @@ -19,7 +19,7 @@ |
| 20 | 20 | |
| 21 | 21 | # Wikimedia's APT repository |
| 22 | 22 | d-i apt-setup/local0/comment string Wikimedia APT repository |
| 23 | | -d-i apt-setup/local0/repository string http://apt.wikimedia.org/wikimedia dapper-wikimedia main contrib non-free |
| | 23 | +d-i apt-setup/local0/repository string http://apt.wikimedia.org/wikimedia dapper-wikimedia main restricted universe multiverse |
| 24 | 24 | d-i apt-setup/local0/source boolean true |
| 25 | 25 | d-i apt-setup/local0/key string http://apt.wikimedia.org/autoinstall/keyring/wikimedia-archive-keyring.gpg |
| 26 | 26 | |
| — | — | @@ -30,4 +30,4 @@ |
| 31 | 31 | d-i preseed/early_command string echo d-i netcfg/get_ipaddress string $(ifconfig | grep "inet addr" | cut -d ' ' -f 12 | sed 's/addr://' | grep -v 127\.0\.0\.1) > /tmp/static_net.cfg && debconf-set-selections /tmp/static_net.cfg && killall.sh; netcfg; true |
| 32 | 32 | |
| 33 | 33 | # Individual additional packages to install |
| 34 | | -d-i preseed/late_command string apt-install openssh-server build-essential zsh sysstat bc joe ntp-simple; mkdir /target/root/.ssh && wget -O /target/root/.ssh/authorized_keys http://www.knams.wikimedia.org/autoinstall/ssh/authorized_keys && chmod go-rwx /target/root/.ssh/authorized_keys; rm -f /usr/lib/prebaseconfig.d/90console && sed -i -e "s/^#T0:/T0:/" /target/etc/inittab; chroot /target /bin/sh -c 'echo -e \\n$(cat /etc/issue.net) auto-installed on $(date). > /etc/motd' |
| | 34 | +d-i preseed/late_command string apt-install wikimedia-base; 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; rm -f /usr/lib/prebaseconfig.d/90console && sed -i -e "s/^#T0:/T0:/" /target/etc/inittab; chroot /target /bin/sh -c 'echo -e \\n$(cat /etc/issue.net) auto-installed on $(date). > /etc/motd' |