Merge lp:~hakuna-matata/wubi/upstart into lp:wubi

[hakuna_matata]

Regarding http://meta.askubuntu.com/a/7596

  * systemd fix for not working mount-move commands in /bin/autopartition-loop
  * EFI support
  * Windows: BCD entries for UEFI, disable Hibernate and Fast Startup
  * Ubuntu: GRUB for x86_64-efi platform
  * Bypass Ubiquity bug (LP: #1385930):
    Use libparted and parted_server version of 14.04
  * loop-remount (LP: #1317437):
    allow remounting of loop device as read-write
    patch is necessary because of unreleased fix
    https://code.launchpad.net/~noorez-kassam/ubuntu/utopic/initramfs-tools/fix-for-1317437
  * Bump to 15.04
  * Use vmlinuz.efi on all amd64 ISOs except Ubuntu Studio
  * Set confirm_nooverwrite on preseeds

[Martin Wimpress (flexiondotorg)]

Could a sponsor please look at this? @hakuna_matata has provided a good selection of fixes here :-)

Unmerged revisions

295. By hakuna_matata on 2015-04-09

Fix for upstart->systemd

294. By hakuna_matata on 2015-04-09

EFI support

293. By hakuna_matata on 2015-04-03

Bypass Ubiquity bug

292. By hakuna_matata on 2015-04-03

Allow remounting of loop device as rw

291. By hakuna_matata on 2015-04-03

Bump to 15.04

=== modified file 'Makefile'
--- Makefile	2014-10-20 15:31:24 +0000
+++ Makefile	2015-05-16 19:21:21 +0000
@@ -81,6 +81,11 @@
 		loadenv biosdisk part_msdos part_gpt fat ntfs ext2 ntfscomp iso9660 loopback search linux boot minicmd cat cpuid chain halt help ls reboot \
 		echo test configfile gzio normal sleep memdisk tar font gfxterm gettext true vbe vga video_bochs video_cirrus probe
 	cat /usr/lib/grub/i386-pc/lnxboot.img build/grubutil/core.img > build/winboot/wubildr
+	mkdir -p build/winboot/EFI
+	grub-mkimage -O x86_64-efi -c build/winboot/wubildr-bootstrap.cfg -m build/winboot/wubildr.tar -o build/winboot/EFI/grubx64.efi \
+		loadenv part_msdos part_gpt fat ntfs ext2 ntfscomp iso9660 loopback search linux linuxefi boot minicmd cat cpuid chain halt help ls reboot \
+		echo test configfile gzio normal sleep memdisk tar font gfxterm gettext true efi_gop efi_uga video_bochs video_cirrus probe efifwsetup
+	cp /usr/lib/shim/shim.efi.signed build/winboot/EFI/shimx64.efi
 
 winboot: grub4dos grubutil
 	mkdir -p build/winboot

=== modified file 'data/custom-installation/hooks/early-command.sh'
--- data/custom-installation/hooks/early-command.sh	2009-01-14 01:33:45 +0000
+++ data/custom-installation/hooks/early-command.sh	2015-05-16 19:21:21 +0000
@@ -1,2 +1,22 @@
 #!/bin/sh
-#Add early commands here
+set -x
+
+if [ -f /custom-installation/hooks/post-installer.sh ]; then
+        mkdir -p  /root/usr/lib/ubiquity/target-config
+	cp /custom-installation/hooks/post-installer.sh  /root/usr/lib/ubiquity/target-config/10post-installer
+	chmod +x /root/usr/lib/ubiquity/target-config/10post-installer
+fi
+
+architecture=$(uname -m | sed s/i6/i3/)
+if [ -f /custom-installation/patch/$architecture/parted_server ]; then
+	cp /custom-installation/patch/$architecture/parted_server  /root/usr/bin/parted_server
+        cp /custom-installation/patch/$architecture/libparted.so.0.0.1 /root/lib/$architecture-linux-gnu/libparted.so.0.0.1
+        ln -s libparted.so.0.0.1 /root/lib/$architecture-linux-gnu/libparted.so.0
+fi
+
+if [ -f /custom-installation/patch/autopartition-loop ]; then
+	cp /custom-installation/patch/autopartition-loop  /root/bin/autopartition-loop
+fi
+
+
+

=== added file 'data/custom-installation/hooks/post-installer.sh'
--- data/custom-installation/hooks/post-installer.sh	1970-01-01 00:00:00 +0000
+++ data/custom-installation/hooks/post-installer.sh	2015-05-16 19:21:21 +0000
@@ -0,0 +1,19 @@
+#!/bin/sh
+set -x
+
+if [ -f /custom-installation/patch/loop-remount ]; then
+	mkdir -p /target/etc/initramfs-tools/hooks
+	cp  /custom-installation/patch/loop-remount /target/etc/initramfs-tools/hooks/loop-remount
+	chmod +x  /target/etc/initramfs-tools/hooks/loop-remount
+fi
+
+if [ -f /custom-installation/patch/grub-install ] && [ -f /custom-installation/patch/grub-install-efi ] ; then
+        if [ -d /target/boot/efi ]; then
+		mkdir -p /target/usr/local/sbin
+		cp /custom-installation/patch/grub-install /target/usr/local/sbin/grub-install
+		chmod +x /target/usr/local/sbin/grub-install
+		cp /custom-installation/patch/grub-install-efi /target/usr/local/sbin/grub-install-efi
+		chmod +x /target/usr/local/sbin/grub-install-efi
+	fi
+fi
+

=== added directory 'data/custom-installation/patch'
=== added file 'data/custom-installation/patch/autopartition-loop'
--- data/custom-installation/patch/autopartition-loop	1970-01-01 00:00:00 +0000
+++ data/custom-installation/patch/autopartition-loop	2015-05-16 19:21:21 +0000
@@ -0,0 +1,379 @@
+#! /bin/sh
+
+. /lib/partman/lib/base.sh
+. /lib/partman/lib/resize.sh
+. /lib/partman/lib/recipes.sh
+
+# busybox wants mount -o move; util-linux wants mount --move. Sigh.
+if [ -d /lib/debian-installer ]; then
+        mount_private='-o private'
+	mount_move='-o move'
+else
+	mount_move='--move'
+        mount_private='--make-private'
+fi
+
+mount $mount_private /
+
+modprobe loop >/dev/null 2>&1 || true
+
+# Set up working directory.
+
+if type mktemp >/dev/null 2>&1; then
+	recipe_dir="$(mktemp -d /tmp/partman-auto-loop.XXXXXX)"
+	trap "rm -rf $recipe_dir" EXIT HUP INT QUIT TERM
+else
+	recipe_dir=/tmp
+fi
+
+# Fetch parameters.
+
+disk="$1"
+
+cd $disk
+
+if ! db_get partman-auto-loop/partition || [ -z "$RET" ]; then
+	logger -t partman-auto-loop "Error: No partition number specified in partman-auto-loop/partition"
+	exit 1
+fi
+partition="$RET"
+
+if ! db_get partman-auto-loop/recipe || [ -z "$RET" ]; then
+	logger -t partman-auto-loop "Error: No recipe specified in partman-auto-loop/recipe"
+	exit 1
+fi
+recipe="$RET"
+echo "$recipe" >"$recipe_dir/loop_recipe"
+
+# Find the requested partition.
+
+db_progress START 0 5 partman-auto/text/automatically_partition
+db_progress INFO partman-auto/progress/info
+
+partition_id=
+partition_fs=
+open_dialog PARTITIONS
+while { read_line num id size type fs path name; [ "$id" ]; }; do
+	if [ "$num" = "$partition" ]; then
+		partition_id="$id"
+		partition_fs="$fs"
+		# go ahead and read all remaining input
+	fi
+done
+close_dialog
+if [ -z "$partition_id" ]; then
+	logger -t partman-auto-loop "Error: Partition number $partition not found in $disk"
+	exit 1
+fi
+
+# Set up the requested partition in partman.
+
+existing=no
+for j in $(
+	for i in /lib/partman/valid_filesystems/*; do
+		[ -x $i ] || continue
+		$i $disk $partition_id existing
+	done
+); do
+	if [ "$j" = "$partition_fs" ]; then
+		existing=yes
+	fi
+done
+
+if [ "$existing" = no ]; then
+	logger -t partman-auto-loop "Error: No filesystem on $disk/$partition_id"
+	exit 1
+fi
+
+echo keep >$partition_id/method
+rm -f $partition_id/format
+>$partition_id/use_filesystem
+echo $partition_fs >$partition_id/filesystem
+mkdir -p $partition_id/options
+echo / >$partition_id/mountpoint
+update_partition $disk $partition_id
+
+# Is there enough space to perform the recipe?
+
+dev="$disk"
+oldid="$partition_id"
+
+recipe_new=
+firstword=
+imagepaths=
+for word in $(cat "$recipe_dir/loop_recipe"); do
+	case $word in
+		.)
+			recipe_new="${recipe_new:+$recipe_new }\$imagepath{ $firstword } $word"
+			firstword=
+			;;
+		*)
+			if [ "$firstword" ]; then
+				recipe_new="${recipe_new:+$recipe_new }$word"
+			else
+				firstword="$word"
+				imagepaths="${imagepaths:+$imagepaths }$word"
+			fi
+			;;
+	esac
+done
+echo "$recipe_new" >"$recipe_dir/loop_recipe_new"
+decode_recipe "$recipe_dir/loop_recipe_new" loop
+
+db_progress STEP 1
+
+fstab="$(
+	for i in /lib/partman/fstab.d/*; do
+		[ -x "$i" ] || continue
+		$i
+	done |
+	while read fs mp type options dump pass; do
+		case $mp in
+			(/)
+				echo $fs $mp $type $options $dump $pass
+				;;
+		esac
+	done
+)"
+
+if [ -z "$fstab" ]; then
+	logger -t partman-auto-loop "Error: No fstab output for $disk/$partition_id"
+	exit 1
+fi
+
+mkdir -p /target
+
+mountpoint="$(grep "^${fstab%% *} [^ ]* [^ ]* [^ ]*rw" /proc/mounts | cut -d ' ' -f2 | head -n1)" || mountpoint=
+if [ "$mountpoint" = /target ]; then
+	# nothing to do
+	:
+elif [ "$mountpoint" ]; then
+	if ! mount $mount_move "$mountpoint" /target; then
+		logger -t partman-auto-loop "Error: Failed to move $mountpoint to /target"
+		exit 1
+	fi
+	unmount_cmd='umount /target'
+else
+	for m in /lib/partman/mount.d/*; do
+		[ -x "$m" ] || continue
+
+		unmount_cmd="$($m "$fstab")"
+		if [ "$?" = 0 ]; then
+			break
+		fi
+	done
+fi
+if [ -d /run ]; then
+	mkdir -p /run/sendsigs.omit.d
+	pidof mount.ntfs >> /run/sendsigs.omit.d/ntfs-3g
+	pidof mount.ntfs-3g >> /run/sendsigs.omit.d/ntfs-3g
+fi
+
+# TODO: handle errors if no mount succeeded
+mkdir -p /host
+mount $mount_move /target /host # TODO error handling
+
+# Don't try to mount this again later.
+rm -f $partition_id/mountpoint
+
+# Ensure there is enough free space.
+check_free_space=false
+requires_disk_space(){
+    [ "$1" != 0 ] || return
+    path="$(echo "$*" | sed 's/.*\$imagepath{  *\([^ }]*\) *}.*/\1/')"
+    [ "$path" != "$*" ] || return
+    case $path in
+		/*)	;;
+		*)	path="/$path" ;;
+    esac
+    [ -f "/host$path" ] && return 
+    check_free_space=true
+}
+foreach_partition 'requires_disk_space $*' 
+
+# Skip resize_range check if images are already created.
+if [ $check_free_space = true ]; then
+    case $partition_fs in
+	linux-swap|fat16|fat32|hfs|hfs+|hfsx)
+		get_resize_range
+		;;
+	ext2|ext3|ext4)
+		if ! search-path tune2fs; then
+			logger -t partman-auto-loop "Error: tune2fs not found"
+			exit 1
+		fi
+		if ! search-path resize2fs; then
+			logger -t partman-auto-loop "Error: resize2fs not found"
+			exit 1
+		fi
+		if ! get_ext2_resize_range; then
+			logger -t partman-auto-loop "Error: Failed to get ext2 resize range for $disk/$partition_id"
+			exit 1
+		fi
+		;;
+	ntfs)
+		if ! search-path ntfsresize; then
+			logger -t partman-auto-loop "Error: ntfsresize not found"
+			exit 1
+		fi
+		if ! get_ntfs_resize_range; then
+			db_input critical partman-auto-loop/unclean_ntfs || true
+			db_go || true
+			logger -t partman-auto-loop "Error: Failed to get NTFS resize range for $disk/$partition_id"
+			reboot
+			exit 1
+		fi
+		;;
+	*)
+		logger -t partman-auto-loop "Cannot calculate free space on filesystems of type $partition_fs"
+		exit 1
+		;;
+    esac
+    free_size="$(expr \( "$cursize" - "$minsize" \) \* 9 / 10)"
+    # convert to megabytes
+    free_size="$(expr 0000000"$free_size" : '0*\(..*\)......$')"
+    if [ $(min_size) -gt $free_size ]; then
+        logger -t partman-auto-loop "Error: partman-auto-loop/recipe too large ($(min_size) > $free_size)"
+        exit 1
+    fi
+fi
+
+# Ensure that no old loop images are present and mountable.
+found_images=
+mkdir -p /tmpmountpoint
+for path in $imagepaths; do
+	case $path in
+		/*)	;;
+		*)	path="/$path" ;;
+	esac
+	if [ -e "/host$path" ]; then
+		if mount -t auto -o loop,ro /host$path /tmpmountpoint 2>/dev/null 3>&-; then
+			found_images="${found_images:+$found_images }$path"
+			umount /tmpmountpoint || true
+			rmdir /tmpmountpoint || true
+		fi
+	fi
+done
+if [ "$found_images" ]; then
+	db_progress STOP
+	db_subst partman-auto-loop/unclean_host PARTITION "$partition"
+	db_subst partman-auto-loop/unclean_host DISK "$disk"
+	db_subst partman-auto-loop/unclean_host IMAGES "$found_images"
+	db_input critical partman-auto-loop/unclean_host || true
+	db_capb
+	db_go || true
+	db_capb backup
+	umount /host || true
+	exit 1
+fi
+
+db_progress STEP 1
+
+expand_scheme
+
+db_progress STEP 1
+
+clean_method
+
+db_progress STEP 1
+
+setup_loop () {
+	[ "$1" != 0 ] || return
+	path="$(echo "$*" | sed 's/.*\$imagepath{  *\([^ }]*\) *}.*/\1/')"
+	[ "$path" != "$*" ] || return
+
+	case $path in
+		/*)	;;
+		*)	path="/$path" ;;
+	esac
+	if [ ! -f "/host$path" ]; then
+		mkdir -p "/host${path%/*}"
+		if [ "$4" = "linux-swap" ]; then
+			# swap requires a file with no holes
+			dd if=/dev/zero of="/host$path" bs="1000000" count="$1"
+		else
+			dd if=/dev/zero of="/host$path" bs="1000000" seek="$1" count=0
+		fi
+	fi
+	if ! losetup -f "/host$path"; then
+		shift
+		continue
+	fi
+	if [ "$4" = linux-swap ]; then
+		loops="/host$path"
+	else
+		loops="$(echo /dev/loop* /dev/loop/*)"
+	fi
+	for loop in $loops; do
+		[ -e "$loop" ] || continue
+		case $loop in
+			/dev/loop*)
+				loopfile="$(losetup "$loop")" || continue
+				# The following works with both busybox's
+				# losetup and util-linux's losetup. Yes,
+				# this is ugly.
+				loopfile="$(echo "$loopfile" | sed 's,.*\(/host/[^)]*\).*,\1,')"
+				;;
+			*)
+				loopfile="$loop"
+				;;
+		esac
+		[ "$loopfile" = "/host$path" ] || continue
+
+		dirname="$(echo "$loop" | sed 's:/:=:g')"
+		dev="$DEVICES/$dirname"
+
+		rm -rf "$dev"
+		mkdir "$dev" || autopartitioning_failed
+		printf "%s" "$loop" >"$dev/device"
+		printf "%s" "$1" >"$dev/size"
+		echo "Loopback on $loopfile" >"$dev/model"
+		echo "$loopfile" >"$dev/loop"
+
+		cd "$dev"
+		open_dialog OPEN "$(cat "$dev/device")"
+		read_line response
+		close_dialog
+		if [ "$response" = failed ]; then
+			cd /
+			rm -rf "$dev"
+			autopartitioning_failed
+		fi
+
+		open_dialog NEW_LABEL loop
+		close_dialog
+
+		# find the free space
+		open_dialog PARTITIONS
+		free_space=
+		while { read_line num id size type fs path name; [ "$id" ]; }; do
+			if [ "$fs" = free ]; then
+				free_space=$id
+				free_size=$size
+			fi
+		done
+		close_dialog
+
+		# create partition in the free space
+		[ "$free_space" ] || autopartitioning_failed
+		open_dialog NEW_PARTITION primary $4 $free_space full ${1}000001
+		read_line num id size type fs path name
+		close_dialog
+
+		shift; shift; shift; shift
+		setup_partition $id $*
+		break
+	done
+}
+
+foreach_partition 'setup_loop $*'
+
+db_progress STEP 1
+
+update_all
+
+apt-install lupin-support
+
+db_progress STOP
+
+exit 0

=== added file 'data/custom-installation/patch/grub-install'
--- data/custom-installation/patch/grub-install	1970-01-01 00:00:00 +0000
+++ data/custom-installation/patch/grub-install	2015-05-16 19:21:21 +0000
@@ -0,0 +1,13 @@
+#! /bin/sh
+set -e
+
+if [ -f /usr/sbin/grub-install.real ]; then
+   if cat /usr/sbin/grub-install | grep "will only work on BIOS" >/dev/null; then
+      if [ -f /usr/local/sbin/grub-install-efi ]; then
+         cp -f /usr/local/sbin/grub-install-efi /usr/sbin/grub-install
+      fi
+   fi
+fi
+
+/usr/sbin/grub-install "$@"
+exit $?

=== added file 'data/custom-installation/patch/grub-install-efi'
--- data/custom-installation/patch/grub-install-efi	1970-01-01 00:00:00 +0000
+++ data/custom-installation/patch/grub-install-efi	2015-05-16 19:21:21 +0000
@@ -0,0 +1,126 @@
+#! /bin/sh
+set -e
+
+# grub-install replacement for use in Wubi installations. This arranges for
+# the grub bootloader installed on the host (wubildr) to be reinstalled
+# rather than installing it to a boot sector.
+#
+# To get at the real MBR if you wish to do so, use grub-install.real
+# instead.
+#
+# Copyright (C) 2009, 2013 Canonical Ltd.
+#
+# Lupin is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Lupin is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Lupin; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+
+want_passthrough () {
+    while [ $# -gt 0 ]; do
+	option="$1"
+	shift
+
+	case $option in
+	    -h|--help|-v|--version)
+		return 0
+		;;
+	    --debug-image)
+		debug_image="$1"
+		shift
+		;;
+	    --debug-image=*)
+		debug_image="${option#--debug-image=}"
+		;;
+	esac
+    done
+    return 1
+}
+
+if want_passthrough "$@" || ! /usr/share/lupin-support/grub-mkimage --test; then
+    grub-install.real "$@"
+    exit $?
+fi
+
+# The C rewrite of grub-install no longer offers --grub-probe or
+# --grub-mkimage options, so we now have to roll our own installation. This
+# is arguably clearer anyway, although it's unfortunately verbose.
+# On the other hand, there is relatively little need to track the real 
+# grub-install code, as it's now in a different language and most of it is
+# unused here anyway.
+
+pkgdatadir=/usr/share/grub
+localedir=/usr/share/locale
+grubdir=/boot/grub
+source_grubdir=/usr/lib/grub
+
+# delete existing files in /boot/grub
+for file in "$grubdir"/*.mod "$grubdir"/*.lst "$grubdir"/*.img "$grubdir"/efiemu??.o; do
+    if [ -f "$file" ] && [ "$(basename "$file")" != menu.lst ]; then
+        rm -f "$file"
+    fi
+done
+
+# delete existing files in /boot/grub/*-pc or /boot/grub/*-efi and install new ones
+for source_dir in "$source_grubdir"/*-pc "$source_grubdir"/*-efi; do
+    if [ -d "$source_dir" ]; then
+        echo "Installing for "$(basename "$source_dir")" platform." >&2
+        dest_grubdir="$grubdir"/"$(basename "$source_dir")"
+        mkdir -p "$dest_grubdir"
+        for file in "$dest_grubdir"/*.mod "$dest_grubdir"/*.lst "$dest_grubdir"/*.img "$dest_grubdir"/efiemu??.o; do
+            if [ -f "$file" ] && [ "$(basename "$file")" != menu.lst ]; then
+                rm -f "$file"
+            fi
+        done
+        for file in "$source_dir"/*.mod "$source_dir"/*.lst "$source_dir"/*.img "$source_dir"/efiemu??.o; do
+            if [ -f "$file" ]; then
+                cp -f "$file" "$dest_grubdir"
+            fi
+        done
+    fi
+done
+
+mkdir -p "$grubdir/locale"
+for dir in "$localedir"/* "$localedir-langpack"/*; do
+    if [ -f "$dir/LC_MESSAGES/grub.mo" ]; then
+	cp -f "$dir/LC_MESSAGES/grub.mo" "$grubdir/locale/${dir##*/}.mo"
+    fi
+done
+
+if [ -f "$pkgdatadir/themes/starfield/theme.txt" ]; then
+    mkdir -p "$grubdir/themes/starfield"
+    cp "$pkgdatadir/themes/starfield"/* "$grubdir/themes/starfield/"
+fi
+
+if [ -f "$pkgdatadir/unicode.pf2" ]; then
+    mkdir -p "$grubdir/fonts"
+    cp "$pkgdatadir/unicode.pf2" "$grubdir/fonts/"
+fi
+
+if [ ! -f "$grubdir/grubenv" ]; then
+    grub-editenv "$grubdir/grubenv" create
+fi
+
+if [ -d "$source_grubdir"/i386-pc ]; then 
+    /usr/share/lupin-support/grub-mkimage
+fi
+
+# If vestiges of GRUB Legacy still exist, tell the Debian packaging that
+# they can ignore them.
+if [ -e /boot/grub/stage2 ] && [ -e /boot/grub/menu.lst ]; then
+    touch /boot/grub/grub2-installed
+fi
+
+echo "Installation finished. No error reported." >&2
+echo >&2
+
+exit 0

=== added directory 'data/custom-installation/patch/i386'
=== added file 'data/custom-installation/patch/i386/libparted.so.0.0.1'
Binary files data/custom-installation/patch/i386/libparted.so.0.0.1	1970-01-01 00:00:00 +0000 and data/custom-installation/patch/i386/libparted.so.0.0.1	2015-05-16 19:21:21 +0000 differ
=== added file 'data/custom-installation/patch/i386/parted_server'
Binary files data/custom-installation/patch/i386/parted_server	1970-01-01 00:00:00 +0000 and data/custom-installation/patch/i386/parted_server	2015-05-16 19:21:21 +0000 differ
=== added file 'data/custom-installation/patch/loop-remount'
--- data/custom-installation/patch/loop-remount	1970-01-01 00:00:00 +0000
+++ data/custom-installation/patch/loop-remount	2015-05-16 19:21:21 +0000
@@ -0,0 +1,14 @@
+#! /bin/sh
+set -e
+
+filename="/usr/share/initramfs-tools/scripts/local"
+oldvalue='mount ${roflag} -o loop -t ${FSTYPE} ${LOOPFLAGS} "/host/${LOOP#/}" ${rootmnt}'
+newvalue='loopdev=`losetup -f`; losetup ${loopdev} "/host/${LOOP#/}"; mount ${roflag} -t ${FSTYPE} ${LOOPFLAGS} ${loopdev} ${rootmnt}'
+
+if [ -f $filename ]; then
+	if cat $filename | grep "$oldvalue" >/dev/null; then
+		sed -i "s%$oldvalue%$newvalue%g" $filename
+	fi
+fi
+
+exit 0

=== added directory 'data/custom-installation/patch/x86_64'
=== added file 'data/custom-installation/patch/x86_64/libparted.so.0.0.1'
Binary files data/custom-installation/patch/x86_64/libparted.so.0.0.1	1970-01-01 00:00:00 +0000 and data/custom-installation/patch/x86_64/libparted.so.0.0.1	2015-05-16 19:21:21 +0000 differ
=== added file 'data/custom-installation/patch/x86_64/parted_server'
Binary files data/custom-installation/patch/x86_64/parted_server	1970-01-01 00:00:00 +0000 and data/custom-installation/patch/x86_64/parted_server	2015-05-16 19:21:21 +0000 differ
=== modified file 'data/isolist.ini'
--- data/isolist.ini	2014-10-16 14:21:48 +0000
+++ data/isolist.ini	2015-05-16 19:21:21 +0000
@@ -1,5 +1,5 @@
 [DEFAULT]
-version=14.10
+version=15.04
 info_file=.disk/info
 kernel=casper/vmlinuz
 initrd=casper/initrd.lz
@@ -20,9 +20,9 @@
 arch=i386
 name=Ubuntu
 packages=ubuntu-desktop
-metalink=http://releases.ubuntu.com/14.10/ubuntu-14.10-desktop-i386.metalink
-#metalink=http://releases.ubuntu.com/14.10/ubuntu-14.10-beta-desktop-i386.metalink
-metalink2=http://cdimage.ubuntu.com/daily-live/current/utopic-desktop-i386.metalink
+metalink=http://releases.ubuntu.com/15.04/ubuntu-15.04-desktop-i386.metalink
+#metalink=http://releases.ubuntu.com/15.04/ubuntu-15.04-beta-desktop-i386.metalink
+metalink2=http://cdimage.ubuntu.com/daily-live/current/vivid-desktop-i386.metalink
 website=http://www.ubuntu.com
 ordering=1
 
@@ -31,9 +31,9 @@
 name=Ubuntu
 packages=ubuntu-desktop
 kernel=casper/vmlinuz.efi
-metalink=http://releases.ubuntu.com/14.10/ubuntu-14.10-desktop-amd64.metalink
-#metalink=http://releases.ubuntu.com/14.10/ubuntu-14.10-beta-desktop-amd64.metalink
-metalink2=http://cdimage.ubuntu.com/daily-live/current/utopic-desktop-amd64.metalink
+metalink=http://releases.ubuntu.com/15.04/ubuntu-15.04-desktop-amd64.metalink
+#metalink=http://releases.ubuntu.com/15.04/ubuntu-15.04-beta-desktop-amd64.metalink
+metalink2=http://cdimage.ubuntu.com/daily-live/current/vivid-desktop-amd64.metalink
 website=http://www.ubuntu.com
 ordering=1
 
@@ -41,8 +41,8 @@
 arch=i386
 name=Kubuntu
 packages=kubuntu-desktop
-metalink=http://cdimage.ubuntu.com/kubuntu/releases/14.10/release/kubuntu-14.10-desktop-i386.metalink
-metalink2=http://cdimage.ubuntu.com/kubuntu/daily-live/current/utopic-desktop-i386.metalink
+metalink=http://cdimage.ubuntu.com/kubuntu/releases/15.04/release/kubuntu-15.04-desktop-i386.metalink
+metalink2=http://cdimage.ubuntu.com/kubuntu/daily-live/current/vivid-desktop-i386.metalink
 website=http://www.kubuntu.org
 ordering=3
 
@@ -50,8 +50,9 @@
 arch=amd64
 name=Kubuntu
 packages=kubuntu-desktop
-metalink=http://cdimage.ubuntu.com/kubuntu/releases/14.10/release/kubuntu-14.10-desktop-amd64.metalink
-metalink2=http://cdimage.ubuntu.com/kubuntu/daily-live/current/utopic-desktop-amd64.metalink
+kernel=casper/vmlinuz.efi
+metalink=http://cdimage.ubuntu.com/kubuntu/releases/15.04/release/kubuntu-15.04-desktop-amd64.metalink
+metalink2=http://cdimage.ubuntu.com/kubuntu/daily-live/current/vivid-desktop-amd64.metalink
 website=http://www.kubuntu.org
 ordering=3
 
@@ -59,8 +60,8 @@
 arch=i386
 name=Mythbuntu
 packages=ubuntu-standard
-metalink=http://cdimage.ubuntu.com/mythbuntu/releases/14.10/release/mythbuntu-14.10-desktop-i386.metalink
-metalink2=http://cdimage.ubuntu.com/mythbuntu/daily-live/current/utopic-desktop-i386.metalink
+metalink=http://cdimage.ubuntu.com/mythbuntu/releases/15.04/release/mythbuntu-15.04-desktop-i386.metalink
+metalink2=http://cdimage.ubuntu.com/mythbuntu/daily-live/current/vivid-desktop-i386.metalink
 website=http://www.mythbuntu.org
 ordering=5
 
@@ -68,8 +69,9 @@
 arch=amd64
 name=Mythbuntu
 packages=ubuntu-standard
-metalink=http://cdimage.ubuntu.com/mythbuntu/releases/14.10/release/mythbuntu-14.10-desktop-amd64.metalink
-metalink2=http://cdimage.ubuntu.com/mythbuntu/daily-live/current/utopic-desktop-amd64.metalink
+kernel=casper/vmlinuz.efi
+metalink=http://cdimage.ubuntu.com/mythbuntu/releases/15.04/release/mythbuntu-15.04-desktop-amd64.metalink
+metalink2=http://cdimage.ubuntu.com/mythbuntu/daily-live/current/vivid-desktop-amd64.metalink
 website=http://www.mythbuntu.org
 ordering=5
 
@@ -81,8 +83,8 @@
 arch=i386
 name=Edubuntu
 packages=edubuntu-desktop
-metalink=http://cdimage.ubuntu.com/edubuntu/releases/14.10/release/edubuntu-14.10-dvd-i386.metalink
-metalink2=http://cdimage.ubuntu.com/edubuntu/dvd/current/utopic-dvd-i386.metalink
+metalink=http://cdimage.ubuntu.com/edubuntu/releases/15.04/release/edubuntu-15.04-dvd-i386.metalink
+metalink2=http://cdimage.ubuntu.com/edubuntu/dvd/current/vivid-dvd-i386.metalink
 website=http://www.edubuntu.org
 ordering=6
 
@@ -95,8 +97,8 @@
 name=Edubuntu
 packages=edubuntu-desktop
 kernel=casper/vmlinuz.efi
-metalink=http://cdimage.ubuntu.com/edubuntu/releases/14.10/release/edubuntu-14.10-dvd-amd64.metalink
-metalink2=http://cdimage.ubuntu.com/edubuntu/dvd/current/utopic-dvd-amd64.metalink
+metalink=http://cdimage.ubuntu.com/edubuntu/releases/15.04/release/edubuntu-15.04-dvd-amd64.metalink
+metalink2=http://cdimage.ubuntu.com/edubuntu/dvd/current/vivid-dvd-amd64.metalink
 website=http://www.edubuntu.org
 ordering=6
 
@@ -104,8 +106,8 @@
 arch=i386
 name=Lubuntu
 packages=lubuntu-desktop
-metalink=http://cdimage.ubuntu.com/lubuntu/releases/14.10/release/lubuntu-14.10-desktop-i386.metalink
-metalink2=http://cdimage.ubuntu.com/lubuntu/daily-live/current/utopic-desktop-i386.metalink
+metalink=http://cdimage.ubuntu.com/lubuntu/releases/15.04/release/lubuntu-15.04-desktop-i386.metalink
+metalink2=http://cdimage.ubuntu.com/lubuntu/daily-live/current/vivid-desktop-i386.metalink
 website=http://lubuntu.net
 ordering=7
 
@@ -113,8 +115,9 @@
 arch=amd64
 name=Lubuntu
 packages=lubuntu-desktop
-metalink=http://cdimage.ubuntu.com/lubuntu/releases/14.10/release/lubuntu-14.10-desktop-amd64.metalink
-metalink2=http://cdimage.ubuntu.com/lubuntu/daily-live/current/utopic-desktop-amd64.metalink
+kernel=casper/vmlinuz.efi
+metalink=http://cdimage.ubuntu.com/lubuntu/releases/15.04/release/lubuntu-15.04-desktop-amd64.metalink
+metalink2=http://cdimage.ubuntu.com/lubuntu/daily-live/current/vivid-desktop-amd64.metalink
 website=http://lubuntu.net
 ordering=7
 
@@ -126,8 +129,8 @@
 arch=i386
 name=Ubuntu Studio
 packages=ubuntustudio-desktop
-metalink=http://cdimage.ubuntu.com/ubuntustudio/releases/14.10/release/ubuntustudio-14.10-dvd-i386.metalink
-metalink2=http://cdimage.ubuntu.com/ubuntustudio/dvd/current/utopic-dvd-i386.metalink
+metalink=http://cdimage.ubuntu.com/ubuntustudio/releases/15.04/release/ubuntustudio-15.04-dvd-i386.metalink
+metalink2=http://cdimage.ubuntu.com/ubuntustudio/dvd/current/vivid-dvd-i386.metalink
 website=http://ubuntustudio.org
 ordering=8
 
@@ -139,8 +142,8 @@
 arch=amd64
 name=Ubuntu Studio
 packages=ubuntustudio-desktop
-metalink=http://cdimage.ubuntu.com/ubuntustudio/releases/14.10/release/ubuntustudio-14.10-dvd-amd64.metalink
-metalink2=http://cdimage.ubuntu.com/ubuntustudio/dvd/current/utopic-dvd-amd64.metalink
+metalink=http://cdimage.ubuntu.com/ubuntustudio/releases/15.04/release/ubuntustudio-15.04-dvd-amd64.metalink
+metalink2=http://cdimage.ubuntu.com/ubuntustudio/dvd/current/vivid-dvd-amd64.metalink
 website=http://ubuntustudio.org
 ordering=8
 

=== modified file 'data/preseed.lupin' (properties changed: -x to +x)
--- data/preseed.lupin	2014-10-16 14:21:48 +0000
+++ data/preseed.lupin	2015-05-16 19:21:21 +0000
@@ -29,13 +29,14 @@
 d-i mirror/http/proxy string
 
 ## SUITE
-d-i mirror/suite string utopic
+d-i mirror/suite string vivid
 
 ## PARTITIONING
 $(partitioning)
 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 select continue
 d-i partman/filter_mounted boolean false
 d-i ubiquity/partman-skip-unmount boolean true
 

=== modified file 'data/preseed.mythbuntu' (properties changed: -x to +x)
--- data/preseed.mythbuntu	2014-10-16 14:21:48 +0000
+++ data/preseed.mythbuntu	2015-05-16 19:21:21 +0000
@@ -29,13 +29,14 @@
 d-i mirror/http/proxy string
 
 ## SUITE
-d-i mirror/suite string utopic
+d-i mirror/suite string vivid
 
 ## PARTITIONING
 $(partitioning)
 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 select continue
 d-i partman/filter_mounted boolean false
 d-i ubiquity/partman-skip-unmount boolean true
 

=== modified file 'data/wubildr.cfg'
--- data/wubildr.cfg	2011-07-26 19:32:51 +0000
+++ data/wubildr.cfg	2015-05-16 19:21:21 +0000
@@ -4,6 +4,7 @@
     if loopback loop0 /ubuntu/disks/root.disk; then
         set root=(loop0)
         if [ -e /boot/grub/grub.cfg ]; then
+            set prefix=($root)'/boot/grub'
             if configfile /boot/grub/grub.cfg; then
                 set show_panic_message=false
             fi

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-20 15:31:24 +0000
+++ debian/changelog	2015-05-16 19:21:21 +0000
@@ -1,3 +1,41 @@
+wubi (15.04) vivid; urgency=low
+
+  [Hakuna Matata]
+   
+  * systemd fix for not working mount-move commands in /bin/autopartition-loop  
+
+wubi (15.04) vivid; urgency=low
+
+  [Hakuna Matata]
+   
+  * EFI support
+  * Windows: BCD entries for UEFI, disable Hibernate and Fast Startup
+  * Ubuntu: GRUB for x86_64-efi platform
+
+wubi (15.04) vivid; urgency=low
+
+  [Hakuna Matata]
+   
+  * Bypass Ubiquity bug (LP: #1385930):
+     Use libparted and parted_server version of 14.04
+
+wubi (15.04) vivid; urgency=low
+
+  [Hakuna Matata]
+   
+  * loop-remount (LP: #1317437):
+    allow remounting of loop device as read-write
+    patch is necessary because of unreleased fix
+    https://code.launchpad.net/~noorez-kassam/ubuntu/utopic/initramfs-tools/fix-for-1317437
+
+wubi (15.04) vivid; urgency=low
+
+  [Hakuna Matata]
+   
+  * Bump to 15.04
+  * Use vmlinuz.efi on all amd64 ISOs except Ubuntu Studio
+  * Set confirm_nooverwrite on preseeds
+ 
 wubi (14.10) utopic; urgency=medium
 
   [ Stéphane Graber ]

=== modified file 'src/wubi/application.py'
--- src/wubi/application.py	2013-04-23 04:44:13 +0000
+++ src/wubi/application.py	2015-05-16 19:21:21 +0000
@@ -151,11 +151,6 @@
                 log.error(message)
                 self.get_frontend().show_error_message(message)
                 self.quit()
-        if self.info.efi:
-            message = "Wubi does not currently support EFI"
-            log.error(message)
-            self.get_frontend().show_error_message(message)
-            self.quit()
         log.info("Running the installer...")
         self.frontend = self.get_frontend()
         self.frontend.show_installation_settings()

=== modified file 'src/wubi/backends/win32/backend.py'
--- src/wubi/backends/win32/backend.py	2013-04-23 04:44:13 +0000
+++ src/wubi/backends/win32/backend.py	2015-05-16 19:21:21 +0000
@@ -569,6 +569,62 @@
                 efi = True
         log.debug('EFI boot = %s' % efi)
         return efi
+     
+    def modify_EFI_folder(self, associated_task,bcdedit):
+        command = [bcdedit, '/enum', '{bootmgr}']
+        boot_drive = run_command(command)
+        boot_drive = boot_drive[boot_drive.index('partition=')+10:]
+        boot_drive = boot_drive[:boot_drive.index('\r')]
+        log.debug("EFI boot partition %s" % boot_drive)
+        # if EFI boot partition is mounted we use it
+        if boot_drive[1]==':':
+            efi_drive = boot_drive
+        else:
+            for efi_drive in 'HIJKLMNOPQRSTUVWXYZ':
+                drive = Drive(efi_drive)
+                if not drive.type:
+                    break
+            efi_drive = efi_drive + ':'
+            log.debug("Temporary EFI drive %s" % efi_drive)
+        if efi_drive != boot_drive:
+            run_command(['mountvol', efi_drive, '/s'])
+        src = join_path(self.info.root_dir, 'winboot','EFI')
+        src.replace(' ', '_')
+        src.replace('__', '_')
+        dest = join_path(efi_drive, 'EFI',self.info.target_dir[3:])
+        dest.replace(' ', '_')
+        dest.replace('__', '_')
+        if not os.path.exists(dest):
+            shutil.os.mkdir(dest)
+        dest = join_path(dest,'wubildr')
+        if os.path.exists(dest):
+            shutil.rmtree(dest)        
+        log.debug('Copying EFI folder %s -> %s' % (src, dest))
+        shutil.copytree(src,  dest)
+        if efi_drive != boot_drive:
+            run_command(['mountvol', efi_drive, '/d'])
+        efi_path = join_path(dest, 'shimx64.efi')[2:]     
+        return efi_path
+
+    def undo_EFI_folder(self, associated_task):
+        for efi_drive in 'HIJKLMNOPQRSTUVWXYZ':
+            drive = Drive(efi_drive)
+            if not drive.type:
+                break
+        efi_drive = efi_drive + ':'
+        log.debug("Temporary EFI drive %s" % efi_drive)
+        try: 
+            run_command(['mountvol', efi_drive, '/s'])
+            dest = join_path(efi_drive, 'EFI',self.info.previous_target_dir[3:],'wubildr')
+            dest.replace(' ', '_')
+            dest.replace('__', '_')
+            if os.path.exists(dest):
+                log.debug('Removing EFI folder %s' % dest)
+                shutil.rmtree(dest)
+            run_command(['mountvol', efi_drive, '/d'])
+        except Exception, err: #this shouldn't be fatal
+            log.error(err)            
+        return
 
     def modify_bootloader(self, associated_task):
         for drive in self.info.drives:
@@ -597,6 +653,11 @@
                 if os.path.isfile(f):
                     os.unlink(f)
 
+        if self.info.efi:
+            log.debug("Undo EFI boot")
+            self.undo_EFI_folder(associated_task) 
+            run_command(['powercfg', '/h', 'on'])
+
     def modify_bootini(self, drive, associated_task):
         log.debug("modify_bootini %s" % drive.path)
         bootini = join_path(drive.path, 'boot.ini')
@@ -712,6 +773,24 @@
             log.debug("BCD has already been modified")
             return
 
+        if self.info.efi:
+            log.debug("EFI boot")
+            efi_path = self.modify_EFI_folder(associated_task,bcdedit)
+            run_command(['powercfg', '/h', 'off'])
+            command = [bcdedit, '/copy', '{bootmgr}', '/d', '%s' % self.info.distro.name]
+            id = run_command(command)
+            id = id[id.index('{'):id.index('}')+1]
+            run_command([bcdedit, '/set', id, 'path', efi_path])
+            run_command([bcdedit, '/set', '{fwbootmgr}', 'displayorder', id, '/addlast'])
+            run_command([bcdedit, '/set', '{fwbootmgr}', 'timeout', '10'])
+            run_command([bcdedit, '/set', '{fwbootmgr}', 'bootsequence', id])
+            registry.set_value(
+                'HKEY_LOCAL_MACHINE',
+                self.info.registry_key,
+                'VistaBootDrive',
+                id)
+            return
+
         command = [bcdedit, '/create', '/d', '%s' % self.info.distro.name, '/application', 'bootsector']
         id = run_command(command)
         id = id[id.index('{'):id.index('}')+1]