updated the patch with packaging changes. -- Regards, Dmitrijs.
From 282ef234b2026fe6dbf8b358f3e1444d8b401ce5 Mon Sep 17 00:00:00 2001 From: Dmitrijs Ledkovs <dmitrijs.ledkovs@canonical.com> Date: Fri, 6 Jul 2012 17:55:26 +0100 Subject: [PATCH] Move apt-install lvm2 from post-base-installer.d to finish.d as all other partman-$fs do the same. --- debian/changelog | 7 +++++++ debian/di-numbers | 1 + debian/install | 1 - finish.d/_numbers | 1 + finish.d/aptinstall_lvm | 11 +++++++++++ post-base-installer.d/64partman-lvm | 11 ----------- 6 files changed, 20 insertions(+), 12 deletions(-) create mode 100644 finish.d/_numbers create mode 100755 finish.d/aptinstall_lvm delete mode 100755 post-base-installer.d/64partman-lvm diff --git a/debian/changelog b/debian/changelog index b2b0ca2..e487b07 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +partman-lvm (80) UNRELEASED; urgency=low + + * Move apt-install lvm2 from post-base-installer.d to finish.d + as all other partman-$fs do the same. + + -- Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com> Fri, 06 Jul 2012 17:36:32 +0100 + partman-lvm (79) unstable; urgency=low * Team upload diff --git a/debian/di-numbers b/debian/di-numbers index 5a5aa4f..36217d3 100644 --- a/debian/di-numbers +++ b/debian/di-numbers @@ -3,3 +3,4 @@ choose_partition lib/partman init.d lib/partman undo.d lib/partman update.d lib/partman +finish.d lib/partman diff --git a/debian/install b/debian/install index 5b8cd7d..3bc3c03 100644 --- a/debian/install +++ b/debian/install @@ -1,2 +1 @@ lib lib/partman -post-base-installer.d usr/lib diff --git a/finish.d/_numbers b/finish.d/_numbers new file mode 100644 index 0000000..02a8903 --- /dev/null +++ b/finish.d/_numbers @@ -0,0 +1 @@ +70 aptinstall_lvm diff --git a/finish.d/aptinstall_lvm b/finish.d/aptinstall_lvm new file mode 100755 index 0000000..dca4464 --- /dev/null +++ b/finish.d/aptinstall_lvm @@ -0,0 +1,11 @@ +#! /bin/sh +set -e + +if grep -q " device-mapper$" /proc/misc; then + # Avoid warnings from lvm2 tools about open file descriptors + export LVM_SUPPRESS_FD_WARNINGS=1 + + if pvdisplay | grep -iq "physical volume ---"; then + apt-install lvm2 + fi +fi diff --git a/post-base-installer.d/64partman-lvm b/post-base-installer.d/64partman-lvm deleted file mode 100755 index dca4464..0000000 --- a/post-base-installer.d/64partman-lvm +++ /dev/null @@ -1,11 +0,0 @@ -#! /bin/sh -set -e - -if grep -q " device-mapper$" /proc/misc; then - # Avoid warnings from lvm2 tools about open file descriptors - export LVM_SUPPRESS_FD_WARNINGS=1 - - if pvdisplay | grep -iq "physical volume ---"; then - apt-install lvm2 - fi -fi -- 1.7.10.4
Attachment:
signature.asc
Description: OpenPGP digital signature