diff -Nru /tmp/mgV0GY0cLX/ubiquity-1.1.22/d-i/manifest /tmp/AmkgByWEbR/ubiquity-1.1.23/d-i/manifest --- /tmp/mgV0GY0cLX/ubiquity-1.1.22/d-i/manifest 2006-09-21 11:35:43.000000000 +0100 +++ /tmp/AmkgByWEbR/ubiquity-1.1.23/d-i/manifest 2006-09-25 13:09:17.000000000 +0100 @@ -2,7 +2,7 @@ base-installer 1.63ubuntu4 choose-mirror 2.04ubuntu1 clock-setup 0.10ubuntu1 -console-setup 1.7ubuntu9 +console-setup 1.7ubuntu12 debian-installer-utils 1.35ubuntu2 grub-installer 1.17ubuntu1 hw-detect 1.41ubuntu2 @@ -10,7 +10,7 @@ partconf 1.17 partman-auto 54ubuntu4 partman-base 90ubuntu5 -partman-basicfilesystems 47ubuntu2 +partman-basicfilesystems 47ubuntu3 partman-basicmethods 30 partman-efi 9.1 partman-ext3 41 @@ -19,7 +19,7 @@ partman-palo 4 partman-partitioning 40ubuntu1 partman-reiserfs 31 -partman-target 45ubuntu1 +partman-target 45ubuntu2 partman-xfs 29 silo-installer 1.04ubuntu1 tzsetup 1:0.10ubuntu2 diff -Nru /tmp/mgV0GY0cLX/ubiquity-1.1.22/d-i/source/console-setup/debian/changelog /tmp/AmkgByWEbR/ubiquity-1.1.23/d-i/source/console-setup/debian/changelog --- /tmp/mgV0GY0cLX/ubiquity-1.1.22/d-i/source/console-setup/debian/changelog 2006-09-13 10:24:21.000000000 +0100 +++ /tmp/AmkgByWEbR/ubiquity-1.1.23/d-i/source/console-setup/debian/changelog 2006-09-23 00:40:51.000000000 +0100 @@ -1,3 +1,43 @@ +console-setup (1.7ubuntu12) edgy; urgency=low + + * Don't run the init script (and thereby setupcon) on upgrade; just print + a message telling you to run setupcon from a virtual console if you want + to update your console configuration (closes: Malone #61723). + * Update debian-installer/keymap handling from trunk (Anton Zinoviev). + Drop /etc/X11/xorg.conf upgrade handling, also per trunk, as I've been + convinced that that is much less safe due to the prevalence of GNOME/KDE + keymap overrides, and furthermore it made it more difficult to have + ubiquity tell console-setup just to guess a default from the locale. + * Drop the priority of the model and layout questions to medium if a + configuration file already exists, since they'll have been asked at + medium first time round and if we then ask them at critical the second + time round they will be unexpectedly shown (closes: Malone #59883). + * Backport from trunk: + - config.proto: Handle properly the case when the user backs up from the + first Debconf question. + + -- Colin Watson Sat, 23 Sep 2006 00:40:48 +0100 + +console-setup (1.7ubuntu11) edgy; urgency=low + + * Fix default layout for Bosnian and default variant for Hindi. + + -- Colin Watson Fri, 22 Sep 2006 15:57:23 +0100 + +console-setup (1.7ubuntu10) edgy; urgency=low + + * console-setup Depends: perl; something in ckbcomp is causing perl to + 'use utf8' implicitly, and some of the necessary modules aren't in + perl-base (closes: Malone #60203). + * Allow preseeding of console-setup/modelcode, console-setup/layoutcode, + console-setup/variantcode, console-setup/optionscode, and + console-setup/fontsize. + * Don't set up the console font at boot time if usplash is running, since + that seems to trigger a kernel bug that corrupts the usplash display + (closes: Malone #60483). + + -- Colin Watson Thu, 21 Sep 2006 01:01:54 +0100 + console-setup (1.7ubuntu9) edgy; urgency=low * Switch build-dependency and dependency back to xkb-data, now that it's diff -Nru /tmp/mgV0GY0cLX/ubiquity-1.1.22/d-i/source/console-setup/debian/config.proto /tmp/AmkgByWEbR/ubiquity-1.1.23/d-i/source/console-setup/debian/config.proto --- /tmp/mgV0GY0cLX/ubiquity-1.1.22/d-i/source/console-setup/debian/config.proto 2006-09-10 12:05:27.000000000 +0100 +++ /tmp/AmkgByWEbR/ubiquity-1.1.23/d-i/source/console-setup/debian/config.proto 2006-09-23 00:40:04.000000000 +0100 @@ -811,7 +811,7 @@ default_layout=ara # Arabic ;; bs_*) - default_layout=bs # Bosnia and Herzegovina + default_layout=ba # Bosnia and Herzegovina ;; de_*) default_layout=de # Germany @@ -829,7 +829,7 @@ ;; hi_*) default_layout=in # India - default_variant=dev # Devangari + default_variant=deva # Devangari ;; hr_*) default_layout=hr # Croatia @@ -980,36 +980,21 @@ ;; esac -###################################################################### +####################################################################### -# Load the config file, if it exists. -got_x_config=no -got_full_config=no -if [ -e $CONFIGFILE ]; then - . $CONFIGFILE || true - got_x_config=yes - got_full_config=yes -elif [ -e $XORGCONFIGFILE ]; then - XKBMODEL="$(sed -ne 's/^[[:space:]]\+Option[[:space:]]\+"XkbModel"[[:space:]]\+"\([^"]\+\)"/\1/ip' $XORGCONFIGFILE | head -n1)" - XKBLAYOUT="$(sed -ne 's/^[[:space:]]\+Option[[:space:]]\+"XkbLayout"[[:space:]]\+"\([^"]\+\)"/\1/ip' $XORGCONFIGFILE | head -n1)" - XKBVARIANT="$(sed -ne 's/^[[:space:]]\+Option[[:space:]]\+"XkbVariant"[[:space:]]\+"\([^"]\+\)"/\1/ip' $XORGCONFIGFILE | head -n1)" - XKBOPTIONS="$(sed -ne 's/^[[:space:]]\+Option[[:space:]]\+"XkbOptions"[[:space:]]\+"\([^"]\+\)"/\1/ip' $XORGCONFIGFILE | head -n1)" - got_x_config=yes - layout_priority=medium -elif db_get debian-installer/keymap && [ "$RET" ]; then - # This is a desperation measure, but required for migration from - # pre-console-setup systems without X installed. We just have to copy - # the guesswork formerly done by xserver-xorg.config. - got_x_config=yes - layout_priority=medium +# Use the value of debian-installer/keymap to get better default +# layout. Lower the priority of the Debconf question to medium. + +# This is a desperation measure, but required for migration from +# pre-console-setup systems without X installed. We just have to copy +# the guesswork formerly done by xserver-xorg.config. +if db_get debian-installer/keymap && [ "$RET" ]; then di_keymap="${RET##mac-usb-}" di_keymap="${di_keymap%%-latin1}" - XKBMODEL="$default_model" XKBLAYOUT='' XKBVARIANT='' - XKBOPTIONS='' case "$di_keymap" in be2) XKBLAYOUT="be";; bg) XKBLAYOUT="bg"; XKBVARIANT="bds";; @@ -1025,7 +1010,7 @@ dk) XKBLAYOUT="dk";; es) XKBLAYOUT="es";; et) XKBLAYOUT="ee";; - fi) XKBLAYOUT="fi";; + 'fi') XKBLAYOUT="fi";; fr-latin9) XKBLAYOUT="fr"; XKBVARIANT="latin9";; fr_CH) XKBLAYOUT="ch"; XKBVARIANT="fr";; fr) XKBLAYOUT="fr";; @@ -1038,7 +1023,6 @@ la) XKBLAYOUT="latam";; lt) XKBLAYOUT="lt";; lv-latin4) XKBLAYOUT="lv";; - # XXX should these be XKBMODEL="macintosh"? mac-us-std) XKBLAYOUT="us";; mac-de2-ext) XKBLAYOUT="de"; XKBVARIANT="nodeadkeys";; mac-fr2-ext) XKBLAYOUT="fr";; @@ -1061,19 +1045,68 @@ ua) XKBLAYOUT="ua";; uk) XKBLAYOUT="gb";; us) XKBLAYOUT="us"; XKBMODEL="pc104";; - *) got_x_config=no; layout_priority=critical;; + esac + + # Currently the following two lines are meaningless but stay here + # in case some wants to use the real XkbLayout and XkbVariant for + # the non-Latin layouts + XKBLAYOUT=${XKBLAYOUT#*,} + XKBVARIANT=${XKBVARIANT#*,} + + case "$XKBLAYOUT" in + '') + layout_priority=critical + ;; + bg) + # since there are two incompatible layouts and the console + # provides only one of them + default_layout="$XKBLAYOUT" + default_variant="$XKBVARIANT" + layout_priority=high + ;; + *) + default_layout="$XKBLAYOUT" + default_variant="$XKBVARIANT" + layout_priority=medium + ;; esac fi + +# Get defaults from debconf, to allow preseeding. +if db_get console-setup/modelcode && [ "$RET" ]; then + default_model="$RET" +fi +if db_get console-setup/layoutcode && [ "$RET" ]; then + default_layout="$RET" + layout_priority=medium + db_set console-setup/ask_detect false + db_fset console-setup/ask_detect seen true +fi +if db_get console-setup/variantcode && [ "$RET" ]; then + default_variant="$RET" +fi +if db_get console-setup/optionscode && [ "$RET" ]; then + XKBOPTIONS="$RET" + got_xkboptions=yes +fi +if db_get console-setup/fontsize && [ "$RET" ]; then + db_set console-setup/fontsize-text "$RET" + db_set console-setup/fontsize-fb "$RET" +fi -if [ "$got_full_config" = yes ]; then +# Load the config file, if it exists. +if [ -e $CONFIGFILE ]; then + . $CONFIGFILE || true + + got_full_config=yes + got_xkboptions=yes + model_priority=medium + layout_priority=medium default_ttys="$ACTIVE_CONSOLES" default_charmap="$CHARMAP" default_codeset="$CODESET" default_fontface="$FONTFACE" default_fontsize="$FONTSIZE" -fi - -if [ "$got_x_config" = yes ]; then default_model="$XKBMODEL" case "$XKBLAYOUT" in @@ -1091,15 +1124,15 @@ default_variant="$XKBVARIANT" ;; esac +fi +if [ "$got_xkboptions" = yes ]; then default_toggle='No toggling' default_switch='No temporary switch' default_altgr='No AltGr key' default_compose='No compose key' for option in `echo $XKBOPTIONS | sed 's/,/ /g'`; do case "$option" in - '') - ;; grp:caps_toggle) default_toggle='Caps Lock';; grp:toggle) @@ -1176,9 +1209,9 @@ done fi -# Store values from config file into debconf db. - if [ "$got_full_config" = yes ]; then + # Store values from config file into debconf db. + db_set console-setup/ttys "$default_ttys" db_set console-setup/charmap "$default_charmap" db_set console-setup/codeset "$default_codeset" @@ -1187,14 +1220,14 @@ db_set console-setup/fontsize-fb "$default_fontsize" db_set console-setup/fontsize "$default_fontsize" fi -if [ "$got_x_config" = yes ]; then +if [ "$got_xkboptions" = yes ]; then db_set console-setup/toggle "$default_toggle" db_set console-setup/switch "$default_switch" db_set console-setup/altgr "$default_altgr" db_set console-setup/compose "$default_compose" fi -###################################################################### +####################################################################### STATE=1 old_state=0 @@ -1741,6 +1774,6 @@ old_state=$starting_state done -if [ $STATE -eq 1 ]; then +if [ $STATE -eq 0 ]; then exit 10 fi diff -Nru /tmp/mgV0GY0cLX/ubiquity-1.1.22/d-i/source/console-setup/debian/console-setup-mini.console-setup.init /tmp/AmkgByWEbR/ubiquity-1.1.23/d-i/source/console-setup/debian/console-setup-mini.console-setup.init --- /tmp/mgV0GY0cLX/ubiquity-1.1.22/d-i/source/console-setup/debian/console-setup-mini.console-setup.init 2006-09-11 09:24:02.000000000 +0100 +++ /tmp/AmkgByWEbR/ubiquity-1.1.23/d-i/source/console-setup/debian/console-setup-mini.console-setup.init 2006-09-22 16:53:24.000000000 +0100 @@ -12,11 +12,20 @@ ;; start|force-reload|restart|reload) if [ -z "$DISPLAY" ]; then - log_begin_msg "Setting up console font and keymap..." - if setupcon --force; then - log_end_msg 0 + if pidof usplash >/dev/null; then + log_begin_msg "Setting up console keymap..." + if setupcon -k --force; then + log_end_msg 0 + else + log_end_msg $? + fi else - log_end_msg $? + log_begin_msg "Setting up console font and keymap..." + if setupcon --force; then + log_end_msg 0 + else + log_end_msg $? + fi fi fi ;; diff -Nru /tmp/mgV0GY0cLX/ubiquity-1.1.22/d-i/source/console-setup/debian/console-setup-mini.postinst /tmp/AmkgByWEbR/ubiquity-1.1.23/d-i/source/console-setup/debian/console-setup-mini.postinst --- /tmp/mgV0GY0cLX/ubiquity-1.1.22/d-i/source/console-setup/debian/console-setup-mini.postinst 2006-09-11 09:47:34.000000000 +0100 +++ /tmp/AmkgByWEbR/ubiquity-1.1.23/d-i/source/console-setup/debian/console-setup-mini.postinst 2006-09-22 16:53:09.000000000 +0100 @@ -138,6 +138,11 @@ if [ -f /usr/share/console-setup-mini/console-setup.config ] && \ [ -d /lib/debian-installer ]; then setupcon --force +else + cat >&2 <&2 </dev/null; then + log_begin_msg "Setting up console keymap..." + if setupcon -k --force; then + log_end_msg 0 + else + log_end_msg $? + fi else - log_end_msg $? + log_begin_msg "Setting up console font and keymap..." + if setupcon --force; then + log_end_msg 0 + else + log_end_msg $? + fi fi fi ;; diff -Nru /tmp/mgV0GY0cLX/ubiquity-1.1.22/d-i/source/console-setup/debian/console-setup.postinst /tmp/AmkgByWEbR/ubiquity-1.1.23/d-i/source/console-setup/debian/console-setup.postinst --- /tmp/mgV0GY0cLX/ubiquity-1.1.22/d-i/source/console-setup/debian/console-setup.postinst 2006-09-11 09:47:34.000000000 +0100 +++ /tmp/AmkgByWEbR/ubiquity-1.1.23/d-i/source/console-setup/debian/console-setup.postinst 2006-09-22 16:53:09.000000000 +0100 @@ -138,6 +138,11 @@ if [ -f /usr/share/console-setup-mini/console-setup.config ] && \ [ -d /lib/debian-installer ]; then setupcon --force +else + cat >&2 <= 0.99-12) | console-tools (>= 1:0.2.3-16) -Depends: debconf (>= 0.5) | debconf-2.0, console-terminus (>= 4.16), xkb-data (>= 0.8-7ubuntu2), lsb-base (>= 3.0-6) +Depends: debconf (>= 0.5) | debconf-2.0, perl, console-terminus (>= 4.16), xkb-data (>= 0.8-7ubuntu2), lsb-base (>= 3.0-6) Description: Setup the font and the keyboard on the console The package provides the Linux console with the same versatile keyboard configuration that X Window uses. As a result there is no diff -Nru /tmp/mgV0GY0cLX/ubiquity-1.1.22/d-i/source/console-setup/debian/rules /tmp/AmkgByWEbR/ubiquity-1.1.23/d-i/source/console-setup/debian/rules --- /tmp/mgV0GY0cLX/ubiquity-1.1.22/d-i/source/console-setup/debian/rules 2006-09-06 21:57:42.000000000 +0100 +++ /tmp/AmkgByWEbR/ubiquity-1.1.23/d-i/source/console-setup/debian/rules 2006-09-22 16:50:51.000000000 +0100 @@ -188,7 +188,7 @@ rm -rf `find debian/bdf2psf -name .svn` # common dh_installinit --no-start --name keyboard-setup -- start 06 S . - dh_installinit --name console-setup -- start 49 S . + dh_installinit --no-start --name console-setup -- start 49 S . # Build architecture-independent files here. .PHONY : binary-indep diff -Nru /tmp/mgV0GY0cLX/ubiquity-1.1.22/d-i/source/partman-basicfilesystems/debian/changelog /tmp/AmkgByWEbR/ubiquity-1.1.23/d-i/source/partman-basicfilesystems/debian/changelog --- /tmp/mgV0GY0cLX/ubiquity-1.1.22/d-i/source/partman-basicfilesystems/debian/changelog 2006-09-13 18:44:38.000000000 +0100 +++ /tmp/AmkgByWEbR/ubiquity-1.1.23/d-i/source/partman-basicfilesystems/debian/changelog 2006-09-25 11:24:32.000000000 +0100 @@ -1,3 +1,10 @@ +partman-basicfilesystems (47ubuntu3) edgy; urgency=low + + * Don't automatically set up mount points for IEEE1394 or USB removable + devices (closes: Malone #60552). + + -- Colin Watson Mon, 25 Sep 2006 11:24:28 +0100 + partman-basicfilesystems (47ubuntu2) edgy; urgency=low * Add NTFS to partman-basicfilesystems/posix_filesystem_required check; diff -Nru /tmp/mgV0GY0cLX/ubiquity-1.1.22/d-i/source/partman-basicfilesystems/init.d/auto_mountpoints /tmp/AmkgByWEbR/ubiquity-1.1.23/d-i/source/partman-basicfilesystems/init.d/auto_mountpoints --- /tmp/mgV0GY0cLX/ubiquity-1.1.22/d-i/source/partman-basicfilesystems/init.d/auto_mountpoints 2006-05-16 11:15:01.000000000 +0100 +++ /tmp/AmkgByWEbR/ubiquity-1.1.23/d-i/source/partman-basicfilesystems/init.d/auto_mountpoints 2006-09-25 11:23:56.000000000 +0100 @@ -15,6 +15,9 @@ cd $dev open_dialog PARTITIONS while { read_line num id size type fs path name; [ "$id" ]; }; do + if udevinfo -q env -n "$path" 2>/dev/null | egrep -q 'ID_PATH=(pci-[^-]*-)?(ieee1394|usb)'; then + continue + fi [ -f $id/detected_filesystem ] || continue fs=$(cat $id/detected_filesystem) if [ "$name" ]; then diff -Nru /tmp/mgV0GY0cLX/ubiquity-1.1.22/d-i/source/partman-target/debian/changelog /tmp/AmkgByWEbR/ubiquity-1.1.23/d-i/source/partman-target/debian/changelog --- /tmp/mgV0GY0cLX/ubiquity-1.1.22/d-i/source/partman-target/debian/changelog 2006-08-30 11:22:45.000000000 +0100 +++ /tmp/AmkgByWEbR/ubiquity-1.1.23/d-i/source/partman-target/debian/changelog 2006-09-23 00:47:44.000000000 +0100 @@ -1,3 +1,10 @@ +partman-target (45ubuntu2) edgy; urgency=low + + * Disable automatic mounting of USB removable devices (closes: Malone + #60552). + + -- Colin Watson Sat, 23 Sep 2006 00:47:42 +0100 + partman-target (45ubuntu1) edgy; urgency=low * Resynchronise with Debian. Remaining changes: diff -Nru /tmp/mgV0GY0cLX/ubiquity-1.1.22/d-i/source/partman-target/finish.d/fstab_removable_media_entries /tmp/AmkgByWEbR/ubiquity-1.1.23/d-i/source/partman-target/finish.d/fstab_removable_media_entries --- /tmp/mgV0GY0cLX/ubiquity-1.1.22/d-i/source/partman-target/finish.d/fstab_removable_media_entries 2006-08-30 11:15:31.000000000 +0100 +++ /tmp/AmkgByWEbR/ubiquity-1.1.23/d-i/source/partman-target/finish.d/fstab_removable_media_entries 2006-09-23 00:47:26.000000000 +0100 @@ -135,4 +135,7 @@ fi done -populate_media usb auto rw,user,noauto $USBDEVICES +# See https://launchpad.net/bugs/60552 +if [ "$USBDEVICES" ]; then + logger -t partman-target "USB automounting disabled (would have handled: $USBDEVICES)" +fi diff -Nru /tmp/mgV0GY0cLX/ubiquity-1.1.22/debian/changelog /tmp/AmkgByWEbR/ubiquity-1.1.23/debian/changelog --- /tmp/mgV0GY0cLX/ubiquity-1.1.22/debian/changelog 2006-09-22 10:28:37.000000000 +0100 +++ /tmp/AmkgByWEbR/ubiquity-1.1.23/debian/changelog 2006-09-25 13:11:29.000000000 +0100 @@ -1,3 +1,13 @@ +ubiquity (1.1.23) edgy; urgency=low + + * Move /etc/default/console-setup aside before running the keyboard + configuration page, to avoid console-setup thinking that it's already + configured and behaving differently. + * Automatic update of included source packages: console-setup 1.7ubuntu12, + partman-basicfilesystems 47ubuntu3, partman-target 45ubuntu2. + + -- Colin Watson Mon, 25 Sep 2006 13:11:27 +0100 + ubiquity (1.1.22) edgy; urgency=low [ Jonathan Riddell ] diff -Nru /tmp/mgV0GY0cLX/ubiquity-1.1.22/ubiquity/components/console_setup.py /tmp/AmkgByWEbR/ubiquity-1.1.23/ubiquity/components/console_setup.py --- /tmp/mgV0GY0cLX/ubiquity-1.1.22/ubiquity/components/console_setup.py 2006-09-07 17:15:22.000000000 +0100 +++ /tmp/AmkgByWEbR/ubiquity-1.1.23/ubiquity/components/console_setup.py 2006-09-23 08:40:46.000000000 +0100 @@ -27,6 +27,24 @@ class ConsoleSetup(FilteredCommand): def prepare(self): self.preseed('console-setup/ask_detect', 'false') + + # We need to get rid of /etc/default/console-setup, or console-setup + # will think it's already configured and behave differently. Try to + # save the old file for interest's sake, but it's not a big deal if + # we can't. + try: + os.unlink('/etc/default/console-setup.pre-ubiquity') + except OSError: + pass + try: + os.rename('/etc/default/console-setup', + '/etc/default/console-setup.pre-ubiquity') + except OSError: + try: + os.unlink('/etc/default/console-setup') + except OSError: + pass + # Technically we should provide a version as the second argument, # but that isn't currently needed and it would require querying # apt/dpkg for the current version, which would be slow, so we don't