From d76b52de0a6bbe57053be2814084adc24f734be2 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Thu, 22 Oct 2015 09:04:39 -0500 Subject: [PATCH] ubuntu: wily 15.10 is now out Signed-off-by: Robert Nelson --- README | 1 + lib/distro.conf | 23 +++++++++++- lib/stretch-preseed.cfg | 77 ++++++++++++++++++++++++++++++++++++++ lib/xenial-preseed.cfg | 83 +++++++++++++++++++++++++++++++++++++++++ mk_mmc.sh | 16 +++++++- 5 files changed, 197 insertions(+), 3 deletions(-) create mode 100644 lib/stretch-preseed.cfg create mode 100644 lib/xenial-preseed.cfg diff --git a/README b/README index d2b59a4..5d15cd9 100644 --- a/README +++ b/README @@ -39,6 +39,7 @@ Optional: Ubuntu: trusty (14.04) (EOL: April 2019) vivid (15.04) (EOL: January 2016) + wily (15.10) (EOL: July 2016) --firmware diff --git a/lib/distro.conf b/lib/distro.conf index e40bebf..0b35495 100755 --- a/lib/distro.conf +++ b/lib/distro.conf @@ -21,8 +21,18 @@ vivid-armhf-netboot) NETINSTALL="initrd.gz" ;; wily-armhf-netboot) + #202-Oct-2015 + #http://ports.ubuntu.com/dists/wily/main/installer-armhf/ + NETIMAGE="20101020ubuntu399" + NETIMAGE="current" + TEST_MD5SUM="372dd44123083c2c04dcc3f797f4ed21" + HTTP_IMAGE="http://ports.ubuntu.com/ubuntu-ports/dists" + BASE_IMAGE="generic/netboot" + NETINSTALL="initrd.gz" + ;; +xenial-armhf-netboot) #22-Oct-2014 - #http://ports.ubuntu.com/dists/vivid/main/installer-armhf/ + #http://ports.ubuntu.com/dists/xenial/main/installer-armhf/ # NETIMAGE="20101020ubuntu376" NETIMAGE="current" # TEST_MD5SUM="261032f71ad0e7706efe72e0c7ae7054" @@ -50,5 +60,16 @@ jessie-armhf-netboot) BASE_IMAGE="netboot" NETINSTALL="initrd.gz" ;; +stretch-armhf-netboot) + #01-Sep-2015 + #http://ftp.us.debian.org/debian/dists/stretch/main/installer-armhf/ +# NETIMAGE="20150422+deb8u2" + NETIMAGE="current" +# TEST_MD5SUM="c67ede59f93a0b0f6f70e5ae7ac27659" + TEST_MD5SUM="x" + HTTP_IMAGE="http://ftp.debian.org/debian/dists" + BASE_IMAGE="netboot" + NETINSTALL="initrd.gz" + ;; esac # diff --git a/lib/stretch-preseed.cfg b/lib/stretch-preseed.cfg new file mode 100644 index 0000000..420936b --- /dev/null +++ b/lib/stretch-preseed.cfg @@ -0,0 +1,77 @@ +### Apt setup +# You can choose to install non-free and contrib software. +d-i apt-setup/non-free boolean true +d-i apt-setup/contrib boolean true + +# The Wheezy, USB disabled (no keyboard access) till after you select keymap bug... +#(this is not needed in serial mode) +#d-i console-tools/archs string skip-config +#d-i debian-installer/locale string en_US +#d-i console-keymaps-at/keymap select us + +#Removes the prompt about missing modules: +# Continue without installing a kernel? +d-i base-installer/kernel/skip-install boolean true +# Continue the install without loading kernel modules? +d-i anna/no_kernel_modules boolean true + +# Stop Debian from installing random kernel choice +d-i base-installer/kernel/image select none + +# Additional repositories, local[0-9] available +#d-i apt-setup/local0/repository string \ +# http://local.server/debian stable main +#d-i apt-setup/local0/comment string local server +# Enable deb-src lines +#d-i apt-setup/local0/source boolean true +# URL to the public key of the local repository; you must provide a key or +# apt will complain about the unauthenticated repository and so the +# sources.list line will be left commented out +#d-i apt-setup/local0/key string http://local.server/key + +d-i apt-setup/local0/repository string http://repos.rcn-ee.com/debian/ stretch main + +#apt-cacher-ng allows "custom.gpg" +d-i apt-setup/local0/key string http://repos.rcn-ee.com/debian/conf/custom.gpg + +# Controls whether to use NTP to set the clock during the install +d-i clock-setup/ntp boolean true +# NTP server to use. The default is almost always fine here. +d-i clock-setup/ntp-server string pool.ntp.org + +### Partitioning +## Partitioning example +# If the system has free space you can choose to only partition that space. +# This is only honoured if partman-auto/method (below) is not set. +d-i partman-auto/init_automatically_partition select biggest_free + +# Alternatively, you may specify a disk to partition. If the system has only +# one disk the installer will default to using that, but otherwise the device +# name must be given in traditional, non-devfs format (so e.g. /dev/hda or +# /dev/sda, and not e.g. /dev/discs/disc0/disc). +# For example, to use the first SCSI/SATA hard disk: +d-i partman-auto/disk string /dev/mmcblk0 + +# Or provide a recipe of your own... +# If you have a way to get a recipe file into the d-i environment, you can +# just point at it. +d-i partman-auto/expert_recipe_file string /partition_recipe + +# Individual additional packages to install +d-i pkgsel/include string bash dosfstools initramfs-tools ntpdate rcn-ee-archive-keyring util-linux wget + +# Whether to upgrade packages after debootstrap. +# Allowed values: none, safe-upgrade, full-upgrade +d-i pkgsel/upgrade select safe-upgrade + +# Controls whether to use NTP to set the clock during the install +d-i clock-setup/ntp boolean true + +# During installations from serial console, the regular virtual consoles +# (VT1-VT6) are normally disabled in /etc/inittab. Uncomment the next +# line to prevent this. +d-i finish-install/keep-consoles boolean true + +# Avoid that last message about the install being complete. +d-i finish-install/reboot_in_progress note + diff --git a/lib/xenial-preseed.cfg b/lib/xenial-preseed.cfg new file mode 100644 index 0000000..41138f0 --- /dev/null +++ b/lib/xenial-preseed.cfg @@ -0,0 +1,83 @@ +### Apt setup +# You can choose to install non-free and contrib software. +#d-i apt-setup/non-free boolean true +#d-i apt-setup/contrib boolean true + +# Keyboard selection. +# Disable automatic (interactive) keymap detection. +d-i console-setup/ask_detect boolean false + +# If you select ftp, the mirror/country string does not need to be set. +#d-i mirror/protocol string ftp +d-i mirror/country string manual +d-i mirror/http/hostname string ports.ubuntu.com +d-i mirror/http/directory string /ubuntu-ports + +#Removes the prompt about missing modules: +# Continue without installing a kernel? +d-i base-installer/kernel/skip-install boolean true +# Continue the install without loading kernel modules? +d-i anna/no_kernel_modules boolean true + +# Stop Ubuntu from installing random kernel choice +d-i base-installer/kernel/image select none + +# Additional repositories, local[0-9] available +#d-i apt-setup/local0/repository string \ +# http://local.server/debian stable main +#d-i apt-setup/local0/comment string local server +# Enable deb-src lines +#d-i apt-setup/local0/source boolean true +# URL to the public key of the local repository; you must provide a key or +# apt will complain about the unauthenticated repository and so the +# sources.list line will be left commented out +#d-i apt-setup/local0/key string http://local.server/key + +d-i apt-setup/local0/repository string deb http://repos.rcn-ee.com/ubuntu/ xenial main + +#apt-cacher-ng allows "custom.gpg" +d-i apt-setup/local0/key string http://repos.rcn-ee.com/ubuntu/conf/custom.gpg + +# Controls whether to use NTP to set the clock during the install +d-i clock-setup/ntp boolean true +# NTP server to use. The default is almost always fine here. +d-i clock-setup/ntp-server string pool.ntp.org + +### Partitioning +## Partitioning example +# If the system has free space you can choose to only partition that space. +# This is only honoured if partman-auto/method (below) is not set. +d-i partman-auto/init_automatically_partition select biggest_free + +# Alternatively, you may specify a disk to partition. If the system has only +# one disk the installer will default to using that, but otherwise the device +# name must be given in traditional, non-devfs format (so e.g. /dev/hda or +# /dev/sda, and not e.g. /dev/discs/disc0/disc). +# For example, to use the first SCSI/SATA hard disk: +d-i partman-auto/disk string /dev/mmcblk0 + +# Or provide a recipe of your own... +# If you have a way to get a recipe file into the d-i environment, you can +# just point at it. +d-i partman-auto/expert_recipe_file string /partition_recipe + +# Individual additional packages to install +d-i pkgsel/include string bash dosfstools initramfs-tools ntpdate rcn-ee-archive-keyring util-linux wget + +# Whether to upgrade packages after debootstrap. +# Allowed values: none, safe-upgrade, full-upgrade +d-i pkgsel/upgrade select safe-upgrade + +# Policy for applying updates. May be "none" (no automatic updates), +# "unattended-upgrades" (install security updates automatically), or +# "landscape" (manage system with Landscape). +d-i pkgsel/update-policy select none + +# During installations from serial console, the regular virtual consoles +# (VT1-VT6) are normally disabled in /etc/inittab. Uncomment the next +# line to prevent this. +d-i finish-install/keep-consoles boolean true + +# Avoid that last message about the install being complete. +d-i finish-install/reboot_in_progress note + diff --git a/mk_mmc.sh b/mk_mmc.sh index 027e8f5..76eed32 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -1420,6 +1420,10 @@ check_distro () { DIST="wily" deb_distribution="ubuntu" ;; + xenial|xenial-armhf) + DIST="xenial" + deb_distribution="ubuntu" + ;; wheezy|wheezy-armhf) DIST="wheezy" deb_distribution="debian" @@ -1428,6 +1432,10 @@ check_distro () { DIST="jessie" deb_distribution="debian" ;; + stretch|stretch-armhf) + DIST="stretch" + deb_distribution="debian" + ;; *) IN_VALID_DISTRO=1 cat <<-__EOF__ @@ -1439,10 +1447,12 @@ check_distro () { Debian: wheezy-armhf (Debian 7) jessie (Debian 8) + stretch (Debian 9) (alpha) Ubuntu: trusty (14.04) (EOL: April 2019) vivid (15.04) (EOL: January 2016) - wily (15.10) (alpha) + wily (15.10) (EOL: July 2016) + xenial (16.04) (alpha) ----------------------------- __EOF__ exit @@ -1489,10 +1499,12 @@ usage () { Debian: wheezy-armhf (Debian 7) jessie (Debian 8) + stretch (Debian 9) (alpha) Ubuntu: trusty (14.04) (EOL: April 2019) vivid (15.04) (EOL: January 2016) - wily (15.10) (alpha) + wily (15.10) (EOL: July 2016) + xenial (16.04) (alpha) --firmware