Merge lp:~ev/partman-auto/overwrite into lp:~ubuntu-core-dev/partman-auto/ubuntu

[Evan]

Expose the home preservation path in automatic partitioning.

I'm not sure overwrite is the right word here. Perhaps reuse?

Unmerged revisions

334. By Evan on 2010-11-19

Initial commit.

333. By Colin Watson on 2010-10-21

releasing version 93ubuntu1

332. By Colin Watson on 2010-10-21

sync up EFI recipes with changes from version 93

331. By Colin Watson on 2010-10-21

merge from Debian 93

330. By Colin Watson on 2010-10-21

Get memory size from /sys/firmware/memmap/* rather than using
dmi-available-memory, in line with current base-installer.

329. By Colin Watson on 2010-08-20

releasing version 91ubuntu4

328. By Colin Watson on 2010-08-20

Use /usr/lib/base-installer/dmi-available-memory if available to
determine memory size for RAM-dependent recipe elements (LP: #604765).

327. By Evan on 2010-07-13

releasing version 91ubuntu3

326. By Evan on 2010-07-13

Update template

325. By Evan on 2010-07-12

* Support resizing the largest partition on multiple disks.
* Support formatting the entire partition for any partition that can
  be resized.

=== modified file 'automatically_partition/_numbers'
--- automatically_partition/_numbers	2006-11-23 12:07:01 +0000
+++ automatically_partition/_numbers	2010-11-19 13:26:58 +0000
@@ -1,4 +1,5 @@
 10 resize_use_free
+15 overwrite
 20 some_device
 50 biggest_free
 80 custom

=== added directory 'automatically_partition/overwrite'
=== added file 'automatically_partition/overwrite/choices'
--- automatically_partition/overwrite/choices	1970-01-01 00:00:00 +0000
+++ automatically_partition/overwrite/choices	2010-11-19 13:26:58 +0000
@@ -0,0 +1,72 @@
+#!/bin/sh
+
+. /lib/partman/lib/base.sh
+
+set -e
+
+cleanup_ro_partitions=
+mountpoint="$(mktemp -d /tmp/partman-auto.XXXXXX)"
+cleanup () {
+	# Just in case ...
+	set +e
+	umount $mountpoint
+	rm -rf $mountpoint
+	for p in $cleanup_ro_partitions; do
+		blockdev --setrw $p
+	done
+}
+trap cleanup EXIT HUP INT QUIT TERM
+
+overwrite=
+disks=
+if db_get partman-auto/disk; then
+	disks="$RET"
+fi
+for dev in $DEVICES/*; do
+	[ -d $dev ] || continue
+	if [ "$disks" ]; then
+		partman_disk="$(cat "$dev/device")"
+		local found=0
+		for preseed_disk in $disks; do
+			preseed_id=$(mapdevfs $preseed_disk)
+			case " $preseed_id " in
+			    *" $partman_disk "*)
+				found=1
+				;;
+			    *)
+				continue
+				;;
+			esac
+		done
+		if [ "$found" = "0" ]; then
+			continue
+		fi
+	fi
+	cd $dev
+	open_dialog PARTITIONS
+	while { read_line num id size type fs path name; [ "$id" ]; }; do
+		# TODO Run under newns
+		# Reuse fstab mounts in do_option? Wont already be written
+		# because we'll be deleting fstab?
+		part=$dev//$id
+		blockdev --setro $path
+		cleanup_ro_partitions="$cleanup_ro_partitions $path"
+		t="$(blkid -o value -s TYPE $path)"
+		if [ -n "$t" ] && [ "$t" != "swap" ] && \
+		mount $path $mountpoint 3>&-; then
+			release="$(grep -s DISTRIB_ID $mountpoint/etc/lsb-release)"
+			umount $path || true
+			if [ "${release##DISTRIB_ID=}" = "Ubuntu" ]; then
+				db_subst partman-auto/text/overwrite PARTITION "$(humandev "$path")"
+				db_metaget partman-auto/text/overwrite description
+				overwrite="$overwrite$NL$part$TAB$RET"
+			fi
+		fi
+		blockdev --setrw $path
+	done
+	close_dialog
+done
+
+if [ "$overwrite" ]; then
+	printf %s "$overwrite"
+fi

=== added file 'automatically_partition/overwrite/do_option'
--- automatically_partition/overwrite/do_option	1970-01-01 00:00:00 +0000
+++ automatically_partition/overwrite/do_option	2010-11-19 13:26:58 +0000
@@ -0,0 +1,72 @@
+#!/bin/sh
+
+set -e
+
+. /lib/partman/lib/base.sh
+
+dev=${1%//*}
+id=${1#*//}
+
+cd $dev
+
+setup_reuse_partition () {
+	echo keep > $1/method
+	cp $1/detected_filesystem $1/filesystem
+	mkdir -p $1/options
+	rm -f $1/format
+	>$1/use_filesystem
+}
+
+path=
+cleanup () {
+	set +e
+	umount $path && rm -rf $mountpoint
+	blockdev --setrw $path
+}
+
+setup_reuse_partition $id
+echo / > $id/mountpoint
+update_partition $dev $id
+
+open_dialog PARTITION_INFO $id
+read_line num i size type fs path name
+close_dialog
+mountpoint="$(mktemp -d /tmp/partman-auto.XXXXXX)"
+blockdev --setro $path
+mount $path $mountpoint 3>&-
+trap cleanup EXIT HUP INT QUIT TERM
+
+if [ -f "$mountpoint/etc/fstab" ]; then
+	while read uuid mp rest; do
+		if [ "${uuid%=*}" != "UUID" ]; then
+			continue
+		fi
+		uuid="${uuid#*=}"
+		if [ ! -e "/dev/disk/by-uuid/$uuid" ]; then
+			continue
+		fi
+
+		for dev in $DEVICES/*; do
+			cd $dev
+			open_dialog PARTITIONS
+			partitions=$(read_paragraph)
+			close_dialog
+			echo "$partitions" |
+			while { read num i size type fs p name; [ "$i" ]; }; do
+				if [ "$(cat $i/detected_filesystem)" = "linux-swap" ]; then
+					# Swap will be automatically used.
+					continue
+				fi
+				u="$(blkid -o value -s UUID $p)"
+				if [ "$uuid" = "$u" ]; then
+					setup_reuse_partition $i
+					echo "$mp" > $i/mountpoint
+					update_partition $dev $i
+					break
+				fi
+			done
+		done
+	done < "$mountpoint/etc/fstab"
+fi
+
+exit 100

=== modified file 'debian/changelog'
--- debian/changelog	2010-10-21 16:15:32 +0000
+++ debian/changelog	2010-11-19 13:26:58 +0000
@@ -1,3 +1,9 @@
+partman-auto (93ubuntu2) UNRELEASED; urgency=low
+
+  * Add an option to overwrite an existing installation.
+
+ -- Evan Dandrea <[e-mail]>  Wed, 10 Nov 2010 11:03:48 +0000
+
 partman-auto (93ubuntu1) natty; urgency=low
 
   * Resynchronise with Debian.  Remaining changes:

=== modified file 'debian/partman-auto.templates'
--- debian/partman-auto.templates	2010-07-12 18:17:52 +0000
+++ debian/partman-auto.templates	2010-11-19 13:26:58 +0000
@@ -175,6 +175,10 @@
 Type: text
 _Description: Guided - use entire partition, ${PARTITION}
 
+Template: partman-auto/text/overwrite
+Type: text
+_Description: Guided - overwrite partition, ${PARTITION}
+
 Template: partman-auto/resize_insufficient_space
 Type: error
 _Description: Failed to create enough space for installation