diff --git a/README b/README index d8297eb..edbc27c 100644 --- a/README +++ b/README @@ -34,13 +34,12 @@ Required Options: Optional: --distro Debian: - wheezy-armhf (Debian 7) jessie (Debian 8) stretch (Debian 9) Ubuntu: xenial (16.04 LTS) - yakkety (16.10) - zesty (17.04) + yakkety (16.10) + zesty (17.04) --firmware diff --git a/lib/distro.conf b/lib/distro.conf index 7f08a65..7a8941d 100755 --- a/lib/distro.conf +++ b/lib/distro.conf @@ -38,16 +38,6 @@ zesty-armhf-netboot) BASE_IMAGE="generic/netboot" NETINSTALL="initrd.gz" ;; -wheezy-armhf-netboot) - #30-May-2016 - #http://ftp.us.debian.org/debian/dists/wheezy/main/installer-armhf/ - NETIMAGE="20130613+deb7u3+b2" - TEST_MD5SUM="61df4a3b3d160551097b80855d4d341a" - HTTP_IMAGE="http://ftp.debian.org/debian/dists" - BASE_IMAGE="mx5/netboot/efikamx" - UBOOTWRAPPER=1 - NETINSTALL="uInitrd" - ;; jessie-armhf-netboot) #20-Jul-2017 #http://ftp.us.debian.org/debian/dists/jessie/main/installer-armhf/ diff --git a/lib/wheezy-preseed.cfg b/lib/wheezy-preseed.cfg deleted file mode 100644 index 6d8c422..0000000 --- a/lib/wheezy-preseed.cfg +++ /dev/null @@ -1,74 +0,0 @@ -### 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 - -# 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/ wheezy 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/mk_mmc.sh b/mk_mmc.sh index 5acebec..764df88 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -760,16 +760,6 @@ initrd_preseed_settings () { sed -i -e 's:rcn-ee-archive-keyring:rcn-ee-archive-keyring u-boot-tools:g' "${TEMPDIR}/initrd-tree/preseed.cfg" fi - case "${DIST}" in - wheezy) - if [ ! "x${di_serial_mode}" = "xenable" ] && [ "${conf_kernel_usb_not_builtin}" ] ; then - sed -i -e 's:#d-i console-tools:d-i console-tools:g' "${TEMPDIR}/initrd-tree/preseed.cfg" - sed -i -e 's:#d-i debian-installer:d-i debian-installer:g' "${TEMPDIR}/initrd-tree/preseed.cfg" - sed -i -e 's:#d-i console-keymaps-at:d-i console-keymaps-at:g' "${TEMPDIR}/initrd-tree/preseed.cfg" - fi - ;; - esac - cd "${DIR}/" || true } @@ -1436,10 +1426,6 @@ check_distro () { DIST="zesty" deb_distribution="ubuntu" ;; - wheezy|wheezy-armhf) - DIST="wheezy" - deb_distribution="debian" - ;; jessie|jessie-armhf) DIST="jessie" deb_distribution="debian" @@ -1457,7 +1443,6 @@ check_distro () { ----------------------------- --distro Debian: - wheezy-armhf (Debian 7) jessie (Debian 8) stretch (Debian 9) Ubuntu: @@ -1508,7 +1493,6 @@ usage () { Optional: --distro Debian: - wheezy-armhf (Debian 7) jessie (Debian 8) stretch (Debian 9) Ubuntu: