diff -pruN 1.71/debian/changelog 1.71ubuntu11/debian/changelog --- 1.71/debian/changelog 2016-02-23 22:37:37.000000000 +0000 +++ 1.71ubuntu11/debian/changelog 2019-10-30 16:18:04.000000000 +0000 @@ -1,3 +1,73 @@ +preseed (1.71ubuntu11) focal; urgency=medium + + * Change default preseed root to "d-i/focal/./preseed.cfg". + + -- Adam Conrad Wed, 30 Oct 2019 10:18:04 -0600 + +preseed (1.71ubuntu10) eoan; urgency=medium + + * Change default preseed root to "d-i/eoan/./preseed.cfg". + + -- Adam Conrad Sun, 21 Apr 2019 23:38:41 -0600 + +preseed (1.71ubuntu9) disco; urgency=medium + + * Change default preseed root to "d-i/disco/./preseed.cfg". + + -- Adam Conrad Wed, 31 Oct 2018 22:47:17 -0600 + +preseed (1.71ubuntu8) cosmic; urgency=medium + + * Change default preseed root to "d-i/cosmic/./preseed.cfg". + + -- Adam Conrad Wed, 02 May 2018 14:54:03 -0600 + +preseed (1.71ubuntu7) bionic; urgency=medium + + * Fix for netcfg/hostname, if set, to take precedence. (LP: #1745531) + - Modify debian/network-preseed.postinst to make it more robust + + -- Hua Zhang Thu, 25 Jan 2018 15:12:38 +0800 + +preseed (1.71ubuntu6) bionic; urgency=medium + + * Change default preseed root to "d-i/bionic/./preseed.cfg". + + -- Adam Conrad Fri, 17 Nov 2017 14:43:17 -0700 + +preseed (1.71ubuntu5) artful; urgency=medium + + * Change default preseed root to "d-i/artful/./preseed.cfg". + + -- Adam Conrad Wed, 26 Apr 2017 12:03:35 -0600 + +preseed (1.71ubuntu4) zesty; urgency=medium + + * Change default preseed root to "d-i/zesty/./preseed.cfg". + + -- Adam Conrad Mon, 24 Oct 2016 12:09:31 -0600 + +preseed (1.71ubuntu3) yakkety; urgency=medium + + * Fix for netcfg/hostname, if set, to take precedence. (LP: #1452202) + - Modify debian/network-preseed.postinst + + -- Eric Desrochers Wed, 05 Oct 2016 11:50:09 -0400 + +preseed (1.71ubuntu2) yakkety; urgency=medium + + * Change default preseed root to "d-i/yakkety/./preseed.cfg". + + -- Adam Conrad Fri, 22 Apr 2016 06:01:48 -0600 + +preseed (1.71ubuntu1) xenial; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Change the "keymap" alias to keyboard-configuration/layoutcode. + - Change default preseed root to "d-i/xenial/./preseed.cfg". + + -- Dimitri John Ledkov Wed, 24 Feb 2016 11:40:47 +0000 + preseed (1.71) unstable; urgency=medium [ Hendrik Brueckner ] @@ -21,6 +91,14 @@ preseed (1.69) unstable; urgency=medium -- Philip Hands Fri, 08 Jan 2016 19:49:20 +0100 +preseed (1.68ubuntu1) xenial; urgency=medium + + * Resynchronise with Debian. Remaining changes: + - Change the "keymap" alias to keyboard-configuration/layoutcode. + - Change default preseed root to "d-i/xenial/./preseed.cfg". + + -- Mathieu Trudel-Lapierre Wed, 02 Dec 2015 11:03:49 -0500 + preseed (1.68) unstable; urgency=medium [ Philip Hands ] @@ -56,6 +134,32 @@ preseed (1.65) unstable; urgency=medium -- Christian Perrier Sat, 06 Sep 2014 14:41:58 +0200 +preseed (1.64ubuntu4) xenial; urgency=medium + + * Change default preseed root to "d-i/xenial/./preseed.cfg". + + -- Adam Conrad Thu, 12 Nov 2015 12:07:40 -0700 + +preseed (1.64ubuntu3) wily; urgency=medium + + * Change default preseed root to "d-i/wily/./preseed.cfg". + + -- Adam Conrad Tue, 05 May 2015 01:32:57 -0600 + +preseed (1.64ubuntu2) vivid; urgency=medium + + * Change default preseed root to "d-i/vivid/./preseed.cfg". + + -- Adam Conrad Wed, 29 Oct 2014 23:37:20 -0600 + +preseed (1.64ubuntu1) utopic; urgency=medium + + * Resynchronise with Debian. Remaining changes: + - Change the "keymap" alias to keyboard-configuration/layoutcode. + - Change default preseed root to "d-i/utopic/./preseed.cfg". + + -- Dimitri John Ledkov Mon, 07 Jul 2014 11:14:33 +0100 + preseed (1.64) unstable; urgency=low [ Samuel Thibault ] @@ -74,6 +178,14 @@ preseed (1.63) unstable; urgency=low -- Christian Perrier Thu, 19 Dec 2013 21:05:28 +0100 +preseed (1.62ubuntu1) trusty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Change the "keymap" alias to keyboard-configuration/layoutcode. + - Change default preseed root to "d-i/trusty/./preseed.cfg". + + -- Dmitrijs Ledkovs Mon, 21 Oct 2013 16:19:12 +0100 + preseed (1.62) unstable; urgency=low [ Updated translations ] @@ -88,6 +200,14 @@ preseed (1.61) unstable; urgency=low -- Christian Perrier Sat, 17 Aug 2013 08:44:17 +0200 +preseed (1.60ubuntu1) saucy; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Change the "keymap" alias to keyboard-configuration/layoutcode. + - Change default preseed root to "d-i/saucy/./preseed.cfg". + + -- Dmitrijs Ledkovs Fri, 02 Aug 2013 11:34:04 +0100 + preseed (1.60) unstable; urgency=low [ Dmitrijs Ledkovs ] @@ -111,6 +231,20 @@ preseed (1.58) unstable; urgency=low -- Christian Perrier Thu, 10 Jan 2013 07:38:34 +0100 +preseed (1.57ubuntu2) raring; urgency=low + + * Cherrypick ml.po template fix from d-i svn. Fixes ubiquity ftbfs. + + -- Dmitrijs Ledkovs Wed, 09 Jan 2013 14:58:23 +0000 + +preseed (1.57ubuntu1) raring; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Change the "keymap" alias to keyboard-configuration/layoutcode. + - Change default preseed root to "d-i/raring/./preseed.cfg". + + -- Colin Watson Tue, 08 Jan 2013 10:15:51 +0000 + preseed (1.57) unstable; urgency=low [ Cyril Brulebois ] @@ -124,6 +258,14 @@ preseed (1.57) unstable; urgency=low -- Cyril Brulebois Wed, 26 Dec 2012 19:10:05 +0100 +preseed (1.56ubuntu1) raring; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Change the "keymap" alias to keyboard-configuration/layoutcode. + - Change default preseed root to "d-i/raring/./preseed.cfg". + + -- Colin Watson Mon, 03 Dec 2012 18:11:00 +0000 + preseed (1.56) unstable; urgency=low [ Updated translations ] @@ -131,6 +273,14 @@ preseed (1.56) unstable; urgency=low -- Christian Perrier Thu, 01 Nov 2012 20:04:02 +0100 +preseed (1.55ubuntu1) raring; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Change the "keymap" alias to keyboard-configuration/layoutcode. + - Change default preseed root to "d-i/raring/./preseed.cfg". + + -- Colin Watson Tue, 30 Oct 2012 17:00:57 +0000 + preseed (1.55) unstable; urgency=low [ Updated translations ] @@ -138,6 +288,14 @@ preseed (1.55) unstable; urgency=low -- Christian Perrier Sun, 21 Oct 2012 19:22:52 +0200 +preseed (1.54ubuntu1) quantal; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Change the "keymap" alias to keyboard-configuration/layoutcode. + - Change default preseed root to "d-i/quantal/./preseed.cfg". + + -- Colin Watson Fri, 10 Aug 2012 15:48:35 +0100 + preseed (1.54) unstable; urgency=low * Add myself to Uploaders @@ -147,6 +305,14 @@ preseed (1.54) unstable; urgency=low -- Christian Perrier Sun, 05 Aug 2012 08:40:19 +0200 +preseed (1.53ubuntu1) quantal; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Change the "keymap" alias to keyboard-configuration/layoutcode. + - Change default preseed root to "d-i/quantal/./preseed.cfg". + + -- Colin Watson Tue, 03 Jul 2012 13:56:44 +0100 + preseed (1.53) unstable; urgency=low * Team upload @@ -165,6 +331,15 @@ preseed (1.52) unstable; urgency=low -- Christian Perrier Thu, 21 Jun 2012 22:56:51 +0200 +preseed (1.51ubuntu1) quantal; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Change the "keymap" alias to keyboard-configuration/layoutcode. + * Change default preseed root to "d-i/quantal/./preseed.cfg" + (LP: #1015727). + + -- Colin Watson Wed, 20 Jun 2012 19:31:39 +0100 + preseed (1.51) unstable; urgency=low * Team upload @@ -207,6 +382,15 @@ preseed (1.51) unstable; urgency=low -- Christian Perrier Fri, 15 Jun 2012 18:59:44 +0200 +preseed (1.50ubuntu1) precise; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Change the "keymap" alias to keyboard-configuration/layoutcode, since + Ubuntu uses console-setup. + * Change default preseed root to "d-i/precise/./preseed.cfg". + + -- Colin Watson Mon, 05 Mar 2012 12:28:50 +0000 + preseed (1.50) unstable; urgency=low [ Updated translations ] @@ -241,6 +425,18 @@ preseed (1.50) unstable; urgency=low -- Christian Perrier Mon, 26 Dec 2011 19:09:19 +0100 +preseed (1.49ubuntu1) oneiric; urgency=low + + [ Max Bowsher ] + * In 'autoserver' mode, fetch the preseed file for 'oneiric' instead for + 'wheezy'. LP: #681396 + + [ Colin Watson ] + * Change the "keymap" alias to keyboard-configuration/layoutcode, since + Ubuntu uses console-setup (LP: #74829). + + -- Colin Watson Wed, 04 May 2011 13:26:42 +0100 + preseed (1.49) unstable; urgency=low [ Christian Perrier ] @@ -1189,3 +1385,4 @@ preseed (0.01) unstable; urgency=low * Initial release. -- Joey Hess Wed, 18 Aug 2004 23:43:45 +0100 + diff -pruN 1.71/debian/control 1.71ubuntu11/debian/control --- 1.71/debian/control 2016-02-02 16:24:39.000000000 +0000 +++ 1.71ubuntu11/debian/control 2016-02-24 11:40:03.000000000 +0000 @@ -1,11 +1,13 @@ Source: preseed Section: debian-installer Priority: optional -Maintainer: Debian Install System Team +Maintainer: Ubuntu Installer Team +XSBC-Original-Maintainer: Debian Install System Team Uploaders: Philip Hands , Christian Perrier Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.9) -Vcs-Browser: https://anonscm.debian.org/cgit/d-i/preseed.git -Vcs-Git: https://anonscm.debian.org/git/d-i/preseed.git +XS-Debian-Vcs-Browser: https://anonscm.debian.org/cgit/d-i/preseed.git +XS-Debian-Vcs-Git: https://anonscm.debian.org/git/d-i/preseed.git +Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/preseed/ubuntu Package: preseed-common Architecture: all diff -pruN 1.71/debian/network-preseed.postinst 1.71ubuntu11/debian/network-preseed.postinst --- 1.71/debian/network-preseed.postinst 2016-02-02 16:24:39.000000000 +0000 +++ 1.71ubuntu11/debian/network-preseed.postinst 2018-01-25 07:12:38.000000000 +0000 @@ -14,4 +14,19 @@ if [ -n "$dhcp_url" ]; then preseed_location "$dhcp_url" fi preseed preseed/url + +CURRENT_HOSTNAME=`/bin/hostname` +if db_get netcfg/hostname && [ "$RET" ]; then + if ! echo "$RET" | grep -qw 'ubuntu'; then + # default hostname is ubuntu; if that's what we have in the + # netcfg/hostname template, then netcfg will already have + # done the right thing. + NETCFG_HOSTNAME="$RET" + /bin/sed -i "s/$CURRENT_HOSTNAME/$NETCFG_HOSTNAME/" /etc/hostname + /bin/sed -i "s/\b${CURRENT_HOSTNAME}\b/${NETCFG_HOSTNAME}/g" /etc/hosts + /bin/hostname "$NETCFG_HOSTNAME" + /usr/bin/logger -t netcfg "d-i netcfg/hostname $NETCFG_HOSTNAME took precedence" + fi +fi + preseed_command preseed/early_command diff -pruN 1.71/debian/network-preseed.templates 1.71ubuntu11/debian/network-preseed.templates --- 1.71/debian/network-preseed.templates 2016-02-02 16:24:39.000000000 +0000 +++ 1.71ubuntu11/debian/network-preseed.templates 2019-10-30 16:17:58.000000000 +0000 @@ -38,6 +38,6 @@ Description: for internal use; can be pr Template: auto-install/defaultroot Type: string -Default: d-i/jessie/./preseed.cfg +Default: d-i/focal/./preseed.cfg Description: for internal use; can be preseeded Path added to local server to give the preseed root diff -pruN 1.71/preseed_aliases 1.71ubuntu11/preseed_aliases --- 1.71/preseed_aliases 2016-02-02 16:24:39.000000000 +0000 +++ 1.71ubuntu11/preseed_aliases 2016-02-24 05:13:13.000000000 +0000 @@ -18,5 +18,5 @@ recommends base-installer/install-recomm tasks tasksel:tasksel/first desktop tasksel:tasksel/desktop dmraid disk-detect/dmraid/enable -keymap keyboard-configuration/xkb-keymap +keymap keyboard-configuration/layoutcode preseed-md5 preseed/file/checksum