Remove /usr partitions from all 'multi' recipes. Increment the minimum size of the / partition by the minimum size previously used for the /usr partition, and set the priority and maximum size to be that previously used for the /usr partition.
Update debconf template to reflect that a /usr partition will not
be created.
---
This is entirely untested. Can't remember how to rebuild the installer.
Ben.
debian/changelog | 7 +++++++
debian/partman-auto.templates | 2 +-
recipes-amd64-efi/multi | 10 +---------
recipes-armel-iop32x/multi | 10 +---------
recipes-armel-ixp4xx/multi | 9 +--------
recipes-armel-kirkwood/multi | 10 +---------
recipes-armel-orion5x/multi | 10 +---------
recipes-armhf-efikasb/multi | 10 +---------
recipes-armhf/multi | 10 +---------
recipes-hppa/multi | 10 +---------
recipes-ia64/multi | 9 +--------
recipes-mips-sb1-bcm91250a/multi | 9 +--------
recipes-mips-sb1a-bcm91480b/multi | 9 +--------
recipes-mipsel-loongson-2f/multi | 10 +---------
recipes-mipsel-sb1-bcm91250a/multi | 9 +--------
recipes-mipsel-sb1a-bcm91480b/multi | 9 +--------
recipes-powerpc-apus/multi | 10 +---------
recipes-powerpc-chrp_ibm/multi | 10 +---------
recipes-powerpc-chrp_pegasos/multi | 10 +---------
recipes-powerpc-powermac_newworld/multi | 10 +---------
recipes-powerpc-powermac_oldworld/multi | 10 +---------
recipes-powerpc-prep/multi | 10 +---------
recipes-sparc/multi | 10 +---------
recipes/multi | 10 +---------
24 files changed, 30 insertions(+), 193 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3d120ee..a37d076 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+partman-auto (119) UNRELEASED; urgency=medium
+
+ [ Ben Hutchings ]
+ * Combine / and /usr partitions in 'multi' recipes
+
+ -- Ben Hutchings <b...@decadent.org.uk> Sat, 01 Mar 2014 23:32:28 +0000
+
partman-auto (118) unstable; urgency=low
* Add arm64 recipe
diff --git a/debian/partman-auto.templates b/debian/partman-auto.templates
index 5b81260..a164010 100644
--- a/debian/partman-auto.templates
+++ b/debian/partman-auto.templates
@@ -151,7 +151,7 @@ Template: partman-auto/text/multi_scheme
Type: text
# :sl1:
# TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
-_Description: Separate /home, /usr, /var, and /tmp partitions
+_Description: Separate /home, /var, and /tmp partitions
Template: partman-auto/text/small_disk
Type: text
diff --git a/recipes-amd64-efi/multi b/recipes-amd64-efi/multi
index 25e8ac6..37322bc 100644
--- a/recipes-amd64-efi/multi
+++ b/recipes-amd64-efi/multi
@@ -14,7 +14,7 @@ partman-auto/text/multi_scheme ::
filesystem{ ext2 }
mountpoint{ /boot } .
-100 800 500 $default_filesystem
+800 7000 7000 $default_filesystem
$lvmok{ }
method{ format }
format{ }
@@ -22,14 +22,6 @@ partman-auto/text/multi_scheme ::
$default_filesystem{ }
mountpoint{ / } .
-700 7000 7000 $default_filesystem
- $lvmok{ }
- method{ format }
- format{ }
- use_filesystem{ }
- $default_filesystem{ }
- mountpoint{ /usr } .
-
60 1500 3000 $default_filesystem
$lvmok{ }
method{ format }
diff --git a/recipes-armel-iop32x/multi b/recipes-armel-iop32x/multi
index fb70b76..49edd84 100644
--- a/recipes-armel-iop32x/multi
+++ b/recipes-armel-iop32x/multi
@@ -9,7 +9,7 @@ partman-auto/text/multi_scheme ::
filesystem{ ext2 }
mountpoint{ /boot } .
-70 800 280 $default_filesystem
+570 3000 5000 $default_filesystem
$lvmok{ }
$primary{ }
method{ format }
@@ -18,14 +18,6 @@ partman-auto/text/multi_scheme ::
$default_filesystem{ }
mountpoint{ / } .
-500 3000 5000 $default_filesystem
- $lvmok{ }
- method{ format }
- format{ }
- use_filesystem{ }
- $default_filesystem{ }
- mountpoint{ /usr } .
-
70 1500 3000 $default_filesystem
$lvmok{ }
method{ format }
diff --git a/recipes-armel-ixp4xx/multi b/recipes-armel-ixp4xx/multi
index 1c20cd6..4747caf 100644
--- a/recipes-armel-ixp4xx/multi
+++ b/recipes-armel-ixp4xx/multi
@@ -9,7 +9,7 @@ partman-auto/text/multi_scheme ::
filesystem{ ext2 }
mountpoint{ /boot } .
-70 800 280 $default_filesystem
+570 3000 5000 $default_filesystem
$primary{ }
method{ format }
format{ }
@@ -17,13 +17,6 @@ partman-auto/text/multi_scheme ::
$default_filesystem{ }
mountpoint{ / } .
-500 3000 5000 $default_filesystem
- method{ format }
- format{ }
- use_filesystem{ }
- $default_filesystem{ }
- mountpoint{ /usr } .
-
70 1500 3000 $default_filesystem
method{ format }
format{ }
diff --git a/recipes-armel-kirkwood/multi b/recipes-armel-kirkwood/multi
index fb70b76..49edd84 100644
--- a/recipes-armel-kirkwood/multi
+++ b/recipes-armel-kirkwood/multi
@@ -9,7 +9,7 @@ partman-auto/text/multi_scheme ::
filesystem{ ext2 }
mountpoint{ /boot } .
-70 800 280 $default_filesystem
+570 3000 5000 $default_filesystem
$lvmok{ }
$primary{ }
method{ format }
@@ -18,14 +18,6 @@ partman-auto/text/multi_scheme ::
$default_filesystem{ }
mountpoint{ / } .
-500 3000 5000 $default_filesystem
- $lvmok{ }
- method{ format }
- format{ }
- use_filesystem{ }
- $default_filesystem{ }
- mountpoint{ /usr } .
-
70 1500 3000 $default_filesystem
$lvmok{ }
method{ format }
diff --git a/recipes-armel-orion5x/multi b/recipes-armel-orion5x/multi
index fb70b76..49edd84 100644
--- a/recipes-armel-orion5x/multi
+++ b/recipes-armel-orion5x/multi
@@ -9,7 +9,7 @@ partman-auto/text/multi_scheme ::
filesystem{ ext2 }
mountpoint{ /boot } .
-70 800 280 $default_filesystem
+570 3000 5000 $default_filesystem
$lvmok{ }
$primary{ }
method{ format }
@@ -18,14 +18,6 @@ partman-auto/text/multi_scheme ::
$default_filesystem{ }
mountpoint{ / } .
-500 3000 5000 $default_filesystem
- $lvmok{ }
- method{ format }
- format{ }
- use_filesystem{ }
- $default_filesystem{ }
- mountpoint{ /usr } .
-
70 1500 3000 $default_filesystem
$lvmok{ }
method{ format }
diff --git a/recipes-armhf-efikasb/multi b/recipes-armhf-efikasb/multi
index fb70b76..49edd84 100644
--- a/recipes-armhf-efikasb/multi
+++ b/recipes-armhf-efikasb/multi
@@ -9,7 +9,7 @@ partman-auto/text/multi_scheme ::
filesystem{ ext2 }
mountpoint{ /boot } .
-70 800 280 $default_filesystem
+570 3000 5000 $default_filesystem
$lvmok{ }
$primary{ }
method{ format }
@@ -18,14 +18,6 @@ partman-auto/text/multi_scheme ::
$default_filesystem{ }
mountpoint{ / } .
-500 3000 5000 $default_filesystem
- $lvmok{ }
- method{ format }
- format{ }
- use_filesystem{ }
- $default_filesystem{ }
- mountpoint{ /usr } .
-
70 1500 3000 $default_filesystem
$lvmok{ }
method{ format }
diff --git a/recipes-armhf/multi b/recipes-armhf/multi
index fb70b76..49edd84 100644
--- a/recipes-armhf/multi
+++ b/recipes-armhf/multi
@@ -9,7 +9,7 @@ partman-auto/text/multi_scheme ::
filesystem{ ext2 }
mountpoint{ /boot } .
-70 800 280 $default_filesystem
+570 3000 5000 $default_filesystem
$lvmok{ }
$primary{ }
method{ format }
@@ -18,14 +18,6 @@ partman-auto/text/multi_scheme ::
$default_filesystem{ }
mountpoint{ / } .
-500 3000 5000 $default_filesystem
- $lvmok{ }
- method{ format }
- format{ }
- use_filesystem{ }
- $default_filesystem{ }
- mountpoint{ /usr } .
-
70 1500 3000 $default_filesystem
$lvmok{ }
method{ format }
diff --git a/recipes-hppa/multi b/recipes-hppa/multi
index a722660..f11480f 100644
--- a/recipes-hppa/multi
+++ b/recipes-hppa/multi
@@ -12,7 +12,7 @@ partman-auto/text/multi_scheme ::
filesystem{ ext2 }
mountpoint{ /boot } .
-70 800 280 $default_filesystem
+570 3000 5000 $default_filesystem
$lvmok{ }
$bootable{ }
method{ format }
@@ -21,14 +21,6 @@ partman-auto/text/multi_scheme ::
$default_filesystem{ }
mountpoint{ / } .
-500 3000 5000 $default_filesystem
- $lvmok{ }
- method{ format }
- format{ }
- use_filesystem{ }
- $default_filesystem{ }
- mountpoint{ /usr } .
-
70 1500 3000 $default_filesystem
$lvmok{ }
method{ format }
diff --git a/recipes-ia64/multi b/recipes-ia64/multi
index 2b133c1..db0f97d 100644
--- a/recipes-ia64/multi
+++ b/recipes-ia64/multi
@@ -5,7 +5,7 @@ partman-auto/text/multi_scheme ::
method{ efi }
format{ } .
-100 800 500 $default_filesystem
+800 7000 7000 $default_filesystem
$primary{ }
method{ format }
format{ }
@@ -13,13 +13,6 @@ partman-auto/text/multi_scheme ::
$default_filesystem{ }
mountpoint{ / } .
-700 7000 7000 $default_filesystem
- method{ format }
- format{ }
- use_filesystem{ }
- $default_filesystem{ }
- mountpoint{ /usr } .
-
60 1500 3000 $default_filesystem
method{ format }
format{ }
diff --git a/recipes-mips-sb1-bcm91250a/multi b/recipes-mips-sb1-bcm91250a/multi
index 3552fac..9193120 100644
--- a/recipes-mips-sb1-bcm91250a/multi
+++ b/recipes-mips-sb1-bcm91250a/multi
@@ -13,7 +13,7 @@ partman-auto/text/multi_scheme ::
filesystem{ ext2 }
mountpoint{ /boot } .
-70 800 150 $default_filesystem
+570 3000 5000 $default_filesystem
$primary{ }
method{ format }
format{ }
@@ -21,13 +21,6 @@ partman-auto/text/multi_scheme ::
$default_filesystem{ }
mountpoint{ / } .
-500 3000 5000 $default_filesystem
- method{ format }
- format{ }
- use_filesystem{ }
- $default_filesystem{ }
- mountpoint{ /usr } .
-
70 1500 3000 $default_filesystem
method{ format }
format{ }
diff --git a/recipes-mips-sb1a-bcm91480b/multi
b/recipes-mips-sb1a-bcm91480b/multi
index 3552fac..9193120 100644
--- a/recipes-mips-sb1a-bcm91480b/multi
+++ b/recipes-mips-sb1a-bcm91480b/multi
@@ -13,7 +13,7 @@ partman-auto/text/multi_scheme ::
filesystem{ ext2 }
mountpoint{ /boot } .
-70 800 150 $default_filesystem
+570 3000 5000 $default_filesystem
$primary{ }
method{ format }
format{ }
@@ -21,13 +21,6 @@ partman-auto/text/multi_scheme ::
$default_filesystem{ }
mountpoint{ / } .
-500 3000 5000 $default_filesystem
- method{ format }
- format{ }
- use_filesystem{ }
- $default_filesystem{ }
- mountpoint{ /usr } .
-
70 1500 3000 $default_filesystem
method{ format }
format{ }
diff --git a/recipes-mipsel-loongson-2f/multi b/recipes-mipsel-loongson-2f/multi
index a5016e1..70483a0 100644
--- a/recipes-mipsel-loongson-2f/multi
+++ b/recipes-mipsel-loongson-2f/multi
@@ -9,7 +9,7 @@ partman-auto/text/multi_scheme ::
filesystem{ ext2 }
mountpoint{ /boot } .
-70 800 280 $default_filesystem
+570 3000 5000 $default_filesystem
$lvmok{ }
method{ format }
format{ }
@@ -17,14 +17,6 @@ partman-auto/text/multi_scheme ::
$default_filesystem{ }
mountpoint{ / } .
-500 3000 5000 $default_filesystem
- $lvmok{ }
- method{ format }
- format{ }
- use_filesystem{ }
- $default_filesystem{ }
- mountpoint{ /usr } .
-
70 1500 3000 $default_filesystem
$lvmok{ }
method{ format }
diff --git a/recipes-mipsel-sb1-bcm91250a/multi
b/recipes-mipsel-sb1-bcm91250a/multi
index 3552fac..9193120 100644
--- a/recipes-mipsel-sb1-bcm91250a/multi
+++ b/recipes-mipsel-sb1-bcm91250a/multi
@@ -13,7 +13,7 @@ partman-auto/text/multi_scheme ::
filesystem{ ext2 }
mountpoint{ /boot } .
-70 800 150 $default_filesystem
+570 3000 5000 $default_filesystem
$primary{ }
method{ format }
format{ }
@@ -21,13 +21,6 @@ partman-auto/text/multi_scheme ::
$default_filesystem{ }
mountpoint{ / } .
-500 3000 5000 $default_filesystem
- method{ format }
- format{ }
- use_filesystem{ }
- $default_filesystem{ }
- mountpoint{ /usr } .
-
70 1500 3000 $default_filesystem
method{ format }
format{ }
diff --git a/recipes-mipsel-sb1a-bcm91480b/multi
b/recipes-mipsel-sb1a-bcm91480b/multi
index 3552fac..9193120 100644
--- a/recipes-mipsel-sb1a-bcm91480b/multi
+++ b/recipes-mipsel-sb1a-bcm91480b/multi
@@ -13,7 +13,7 @@ partman-auto/text/multi_scheme ::
filesystem{ ext2 }
mountpoint{ /boot } .
-70 800 150 $default_filesystem
+570 3000 5000 $default_filesystem
$primary{ }
method{ format }
format{ }
@@ -21,13 +21,6 @@ partman-auto/text/multi_scheme ::
$default_filesystem{ }
mountpoint{ / } .
-500 3000 5000 $default_filesystem
- method{ format }
- format{ }
- use_filesystem{ }
- $default_filesystem{ }
- mountpoint{ /usr } .
-
70 1500 3000 $default_filesystem
method{ format }
format{ }
diff --git a/recipes-powerpc-apus/multi b/recipes-powerpc-apus/multi
index 6705703..0c9db32 100644
--- a/recipes-powerpc-apus/multi
+++ b/recipes-powerpc-apus/multi
@@ -14,7 +14,7 @@ partman-auto/text/multi_scheme ::
filesystem{ ext2 }
mountpoint{ /boot } .
-70 800 280 $default_filesystem
+570 3000 5000 $default_filesystem
$lvmok{ }
$primary{ }
method{ format }
@@ -23,14 +23,6 @@ partman-auto/text/multi_scheme ::
$default_filesystem{ }
mountpoint{ / } .
-500 3000 5000 $default_filesystem
- $lvmok{ }
- method{ format }
- format{ }
- use_filesystem{ }
- $default_filesystem{ }
- mountpoint{ /usr } .
-
70 1500 3000 $default_filesystem
$lvmok{ }
method{ format }
diff --git a/recipes-powerpc-chrp_ibm/multi b/recipes-powerpc-chrp_ibm/multi
index 980dc92..83c5397 100644
--- a/recipes-powerpc-chrp_ibm/multi
+++ b/recipes-powerpc-chrp_ibm/multi
@@ -14,7 +14,7 @@ partman-auto/text/multi_scheme ::
filesystem{ ext2 }
mountpoint{ /boot } .
-70 800 280 $default_filesystem
+570 3000 5000 $default_filesystem
$lvmok{ }
$primary{ }
method{ format }
@@ -23,14 +23,6 @@ partman-auto/text/multi_scheme ::
$default_filesystem{ }
mountpoint{ / } .
-500 3000 5000 $default_filesystem
- $lvmok{ }
- method{ format }
- format{ }
- use_filesystem{ }
- $default_filesystem{ }
- mountpoint{ /usr } .
-
70 1500 3000 $default_filesystem
$lvmok{ }
method{ format }
diff --git a/recipes-powerpc-chrp_pegasos/multi
b/recipes-powerpc-chrp_pegasos/multi
index bc85428..a014cf0 100644
--- a/recipes-powerpc-chrp_pegasos/multi
+++ b/recipes-powerpc-chrp_pegasos/multi
@@ -7,7 +7,7 @@ partman-auto/text/multi_scheme ::
filesystem{ ext2 }
mountpoint{ /boot } .
-70 800 280 $default_filesystem
+570 3000 5000 $default_filesystem
$lvmok{ }
method{ format }
format{ }
@@ -15,14 +15,6 @@ partman-auto/text/multi_scheme ::
$default_filesystem{ }
mountpoint{ / } .
-500 3000 5000 $default_filesystem
- $lvmok{ }
- method{ format }
- format{ }
- use_filesystem{ }
- $default_filesystem{ }
- mountpoint{ /usr } .
-
70 1500 3000 $default_filesystem
$lvmok{ }
method{ format }
diff --git a/recipes-powerpc-powermac_newworld/multi
b/recipes-powerpc-powermac_newworld/multi
index f7ab00a..b1da469 100644
--- a/recipes-powerpc-powermac_newworld/multi
+++ b/recipes-powerpc-powermac_newworld/multi
@@ -12,7 +12,7 @@ partman-auto/text/multi_scheme ::
filesystem{ ext2 }
mountpoint{ /boot } .
-70 800 280 $default_filesystem
+570 3000 5000 $default_filesystem
$lvmok{ }
method{ format }
format{ }
@@ -20,14 +20,6 @@ partman-auto/text/multi_scheme ::
$default_filesystem{ }
mountpoint{ / } .
-500 3000 5000 $default_filesystem
- $lvmok{ }
- method{ format }
- format{ }
- use_filesystem{ }
- $default_filesystem{ }
- mountpoint{ /usr } .
-
70 1500 3000 $default_filesystem
$lvmok{ }
method{ format }
diff --git a/recipes-powerpc-powermac_oldworld/multi
b/recipes-powerpc-powermac_oldworld/multi
index bc85428..a014cf0 100644
--- a/recipes-powerpc-powermac_oldworld/multi
+++ b/recipes-powerpc-powermac_oldworld/multi
@@ -7,7 +7,7 @@ partman-auto/text/multi_scheme ::
filesystem{ ext2 }
mountpoint{ /boot } .
-70 800 280 $default_filesystem
+570 3000 5000 $default_filesystem
$lvmok{ }
method{ format }
format{ }
@@ -15,14 +15,6 @@ partman-auto/text/multi_scheme ::
$default_filesystem{ }
mountpoint{ / } .
-500 3000 5000 $default_filesystem
- $lvmok{ }
- method{ format }
- format{ }
- use_filesystem{ }
- $default_filesystem{ }
- mountpoint{ /usr } .
-
70 1500 3000 $default_filesystem
$lvmok{ }
method{ format }
diff --git a/recipes-powerpc-prep/multi b/recipes-powerpc-prep/multi
index 4ef0f3d..81d25da 100644
--- a/recipes-powerpc-prep/multi
+++ b/recipes-powerpc-prep/multi
@@ -5,7 +5,7 @@ partman-auto/text/multi_scheme ::
$bootable{ }
method{ prep } .
-70 800 280 $default_filesystem
+570 3000 5000 $default_filesystem
$lvmok{ }
$primary{ }
method{ format }
@@ -14,14 +14,6 @@ partman-auto/text/multi_scheme ::
$default_filesystem{ }
mountpoint{ / } .
-500 3000 5000 $default_filesystem
- $lvmok{ }
- method{ format }
- format{ }
- use_filesystem{ }
- $default_filesystem{ }
- mountpoint{ /usr } .
-
70 1500 3000 $default_filesystem
$lvmok{ }
method{ format }
diff --git a/recipes-sparc/multi b/recipes-sparc/multi
index 3707524..e2ac27c 100644
--- a/recipes-sparc/multi
+++ b/recipes-sparc/multi
@@ -8,7 +8,7 @@ partman-auto/text/multi_scheme ::
filesystem{ ext2 }
mountpoint{ /boot } .
-70 800 280 $default_filesystem
+570 3000 5000 $default_filesystem
$lvmok{ }
method{ format }
format{ }
@@ -16,14 +16,6 @@ partman-auto/text/multi_scheme ::
$default_filesystem{ }
mountpoint{ / } .
-500 3000 5000 $default_filesystem
- $lvmok{ }
- method{ format }
- format{ }
- use_filesystem{ }
- $default_filesystem{ }
- mountpoint{ /usr } .
-
70 1500 3000 $default_filesystem
$lvmok{ }
method{ format }
diff --git a/recipes/multi b/recipes/multi
index 708e788..31de409 100644
--- a/recipes/multi
+++ b/recipes/multi
@@ -13,7 +13,7 @@ partman-auto/text/multi_scheme ::
filesystem{ ext2 }
mountpoint{ /boot } .
-300 800 350 $default_filesystem
+800 3000 9000 $default_filesystem
$lvmok{ }
method{ format }
format{ }
@@ -21,14 +21,6 @@ partman-auto/text/multi_scheme ::
$default_filesystem{ }
mountpoint{ / } .
-500 3000 9000 $default_filesystem
- $lvmok{ }
- method{ format }
- format{ }
- use_filesystem{ }
- $default_filesystem{ }
- mountpoint{ /usr } .
-
300 1500 3000 $default_filesystem
$lvmok{ }
method{ format }
--
Ben Hutchings
Time is nature's way of making sure that everything doesn't happen at once.
signature.asc
Description: This is a digitally signed message part
