From 3ca171eef5dc220b260ba3eaa2105d7b1f3b58d6 Mon Sep 17 00:00:00 2001 From: Quentin Smith Date: Mon, 27 Dec 2010 14:17:43 -0500 Subject: [PATCH] Add lucid autoinstalls --- code/controls.py | 2 +- code/static/preseed/lucid-amd64.preseed | 1 + code/static/preseed/lucid-i386.preseed | 1 + code/static/preseed/lucid.preseed | 42 ++++++++++++++++++++ code/static/preseed/maverick-amd64.preseed | 1 + code/static/preseed/maverick-i386.preseed | 1 + .../{maverick/amd64.preseed => maverick.preseed} | 0 debian/changelog | 9 +++++ 8 files changed, 56 insertions(+), 1 deletion(-) create mode 120000 code/static/preseed/lucid-amd64.preseed create mode 120000 code/static/preseed/lucid-i386.preseed create mode 100644 code/static/preseed/lucid.preseed create mode 120000 code/static/preseed/maverick-amd64.preseed create mode 120000 code/static/preseed/maverick-i386.preseed rename code/static/preseed/{maverick/amd64.preseed => maverick.preseed} (100%) diff --git a/code/controls.py b/code/controls.py index faa27a7..d04b2f5 100644 --- a/code/controls.py +++ b/code/controls.py @@ -53,7 +53,7 @@ def lvinstall(machine, autoinstall): 'arch=%s' % autoinstall.arch, 'imagesize=%s' % imagesize] if autoinstall.preseed: - installer_options += ['preseed=http://'+config.web.hostname+'/static/preseed/'+autoinstall.distribution+'/'+autoinstall.arch+'.preseed'] + installer_options += ['preseed=http://'+config.web.hostname+'/static/preseed/'+autoinstall.autoinstall_id+'.preseed'] remctl('control', machine.name, 'install', *installer_options) diff --git a/code/static/preseed/lucid-amd64.preseed b/code/static/preseed/lucid-amd64.preseed new file mode 120000 index 0000000..87b3af0 --- /dev/null +++ b/code/static/preseed/lucid-amd64.preseed @@ -0,0 +1 @@ +lucid.preseed \ No newline at end of file diff --git a/code/static/preseed/lucid-i386.preseed b/code/static/preseed/lucid-i386.preseed new file mode 120000 index 0000000..87b3af0 --- /dev/null +++ b/code/static/preseed/lucid-i386.preseed @@ -0,0 +1 @@ +lucid.preseed \ No newline at end of file diff --git a/code/static/preseed/lucid.preseed b/code/static/preseed/lucid.preseed new file mode 100644 index 0000000..c683611 --- /dev/null +++ b/code/static/preseed/lucid.preseed @@ -0,0 +1,42 @@ +# Download packages from mirrors.mit.edu +d-i mirror/country string enter information manually +d-i mirror/http/countries string manual +d-i mirror/http/hostname string mirrors.mit.edu +d-i mirror/http/directory string /ubuntu/ +d-i mirror/http/proxy string + +# Use time.mit.edu for NTP syncing +d-i clock-setup/ntp-server string time.mit.edu + +# Guided partitioning with LVM +d-i partman-auto/method string lvm +d-i partman-auto/choose_recipe select atomic +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true +d-i partman/confirm_write_new_label boolean true +d-i partman/choose_partition select finish +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true + +# Use the linux-virtual kernel +d-i base-installer/kernel/image string linux-virtual + +# Create just a root account +d-i passwd/root-login boolean true +d-i passwd/root-password string fake_value +d-i passwd/root-password-again string fake_value +d-i passwd/make-user boolean false + +# Use GRUB 1 so PyGrub can read the menu.lst +d-i grub-installer/grub2_instead_of_grub_legacy boolean false +# Clear the list of boot device so GRUB doesn't actually get installed +# (grub fails to properly install on /dev/xvda) +d-i grub-installer/bootdev string +d-i grub-installer/only_debian boolean false +d-i grub-installer/with_other_os boolean false + +# Remove the root password so users can log in on the console +d-i preseed/late_command string in-target passwd -d root + +# Avoid that last message about the install being complete. +d-i finish-install/reboot_in_progress note diff --git a/code/static/preseed/maverick-amd64.preseed b/code/static/preseed/maverick-amd64.preseed new file mode 120000 index 0000000..01e787b --- /dev/null +++ b/code/static/preseed/maverick-amd64.preseed @@ -0,0 +1 @@ +maverick.preseed \ No newline at end of file diff --git a/code/static/preseed/maverick-i386.preseed b/code/static/preseed/maverick-i386.preseed new file mode 120000 index 0000000..01e787b --- /dev/null +++ b/code/static/preseed/maverick-i386.preseed @@ -0,0 +1 @@ +maverick.preseed \ No newline at end of file diff --git a/code/static/preseed/maverick/amd64.preseed b/code/static/preseed/maverick.preseed similarity index 100% rename from code/static/preseed/maverick/amd64.preseed rename to code/static/preseed/maverick.preseed diff --git a/debian/changelog b/debian/changelog index a94f1ae..23ac7ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +invirt-web (0.1.14) unstable; urgency=low + + * Add support for i386 maverick and amd64 and i386 lucid autoinstalls. + * Use the autoinstall ID as the preseed filename, instead of the distro + + arch, so that there can be multiple autoinstalls for the same + distro. + + -- Quentin Smith Mon, 27 Dec 2010 14:17:31 -0500 + invirt-web (0.1.13) unstable; urgency=low * Support preseed-based autoinstalls, including amd64 maverick. -- 1.7.9.5