Import Debian version 147+parrot1

partman-auto (2:147+parrot1) testing; urgency=medium * Import new Debian release. * Customize partition layout. partman-auto (147) unstable; urgency=medium * Team upload * Remove trailing whitespaces from changelog file, to fix lintian tag. [ Updated translations ] * Finnish (fi.po) by Juhani Numminen * Traditional Chinese (zh_TW.po) by Louies

Import Debian version 147+parrot1
partman-auto (2:147+parrot1) testing; urgency=medium * Import new Debian release. * Customize partition layout. partman-auto (147) unstable; urgency=medium * Team upload * Remove trailing whitespaces from changelog file, to fix lintian tag. [ Updated translations ] * Finnish (fi.po) by Juhani Numminen * Traditional Chinese (zh_TW.po) by Louies
daba52b1 · Lorenzo "Palinuro" Faletra · eb56102b · daba52b1 · daba52b1 · daba52b1
Unverified Commit daba52b1 authored Mar 10, 2019 by Lorenzo "Palinuro" Faletra
11 changed files
--- a/debian/changelog
+++ b/debian/changelog
-partman-auto (146+parrot1) testing; urgency=medium
+partman-auto (2:147+parrot1) testing; urgency=medium

-  * Use btrfs and xfs as default filesystems.
-  * Adjust default partition layouts.
+  * Import new Debian release.
+  * Customize partition layout.

- -- Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org>  Fri, 23 Nov 2018 00:37:17 +0100
+ -- Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org>  Sun, 10 Mar 2019 23:36:06 +0100
+
+partman-auto (147) unstable; urgency=medium
+  * Team upload
+
+  * Remove trailing whitespaces from changelog file, to fix lintian tag.
+
+  [ Updated translations ]
+  * Finnish (fi.po) by Juhani Numminen
+  * Traditional Chinese (zh_TW.po) by Louies
+
+ -- Holger Wansing <hwansing@mailbox.org>  Sat, 09 Feb 2019 22:29:42 +0100

 partman-auto (146) unstable; urgency=medium

@@ -503,7 +514,7 @@ partman-auto (94) unstable; urgency=low

  * Team upload
  * Bump minimum root partition size to 900MiB in the home
-    recipe. 
+    recipe.
    This will allow installing the standard task and leave room for
    and extra kernel package in later life of the machine
    Closes: #528914
@@ -789,7 +800,7 @@ partman-auto (80) unstable; urgency=low

  [ Updated translations ]
  * Esperanto (eo.po) by Felipe Castro
-	
+
 -- Otavio Salvador <otavio@debian.org>  Tue, 05 Aug 2008 13:40:40 -0300

 partman-auto (79) unstable; urgency=low
@@ -1631,7 +1642,7 @@ partman-auto (45) unstable; urgency=low
  * Icelandic (is.po) by David Steinn Geirsson
  * Romanian (ro.po) by Eddy Petrişor
  * Swedish (sv.po) by Daniel Nylander
-  
+
 -- Joey Hess <joeyh@debian.org>  Tue, 15 Nov 2005 19:25:01 -0500

 partman-auto (44) unstable; urgency=low
@@ -1650,13 +1661,13 @@ partman-auto (43) unstable; urgency=low
  * Changed dependency from partman to partman-base.

  [ Sven Luther ]
-  * Added prep recipes, as a plain copy of the chrp_rs6k ones. 
+  * Added prep recipes, as a plain copy of the chrp_rs6k ones.

 -- Sven Luther <luther@debian.org>  Thu,  1 Sep 2005 13:04:10 +0200

 partman-auto (42) unstable; urgency=low

-  * Updated translations: 
+  * Updated translations:
    - Arabic (ar.po) by Ossama M. Khayat
    - Belarusian (be.po) by Andrei Darashenka
    - German (de.po) by Dennis Stampfer
@@ -1690,7 +1701,7 @@ partman-auto (41) unstable; urgency=low
  * Steve Langasek
    - Fix the alpha multiuser recipe to use fewer partitions, working
      around a parted problem with full disklabels. Closes: #260093.
-  * Updated translations: 
+  * Updated translations:
    - Bosnian (bs.po) by Safir Šećerović
    - Catalan (ca.po) by Guillem Jover
    - German (de.po) by Dennis Stampfer
@@ -1712,7 +1723,7 @@ partman-auto (40) unstable; urgency=low
  * Add sun disk label write then read hack to autopartition script as was
    earlier done to other parts of partman to fix bug #237400.
  * Re-enable whole-device autopartitioning for sparc. Closes: #249142
-  * Updated translations: 
+  * Updated translations:
    - Italian (it.po) by Stefano Canepa

 -- Joey Hess <joeyh@debian.org>  Thu, 11 Nov 2004 01:46:37 -0500
@@ -1739,7 +1750,7 @@ partman-auto (37) unstable; urgency=low

 partman-auto (36) unstable; urgency=low

-  * Updated translations: 
+  * Updated translations:
    - Bulgarian (bg.po) by Ognyan Kulev
    - Catalan (ca.po) by Jordi Mallach
    - Czech (cs.po) by Miroslav Kure
@@ -1780,7 +1791,7 @@ partman-auto (35) unstable; urgency=low

  * Anton Zinoviev
    - recipes.sh (decode_recipe): calculate properly the RAM size on 2.6 kernel
-  * Updated translations: 
+  * Updated translations:
    - Bulgarian (bg.po) by Ognyan Kulev
    - Greek, Modern (1453-) (el.po) by Greek Translation Team
    - French (fr.po) by French Team
@@ -1804,7 +1815,7 @@ partman-auto (34) unstable; urgency=low
    - Make autopartition be used for both types of autopartitioning.
    - Add partman-auto/disk which can be preseeded to force use of a specific
      disk for autopartitioning.
-  * Updated translations: 
+  * Updated translations:
    - Catalan (ca.po) by Jordi Mallach
    - Czech (cs.po) by Miroslav Kure
    - Danish (da.po) by Claus Hindsgaul
@@ -1871,7 +1882,7 @@ partman-auto (31) unstable; urgency=low
    - limit the maximum size of the swap to 3 times the available RAM but
      not less than 64 MB.  Thanks to Margarita Manterola, closes: #254935
    - README: document #261244 and #265290
-  * Updated translations: 
+  * Updated translations:
    - Arabic (ar.po) by Christian Perrier
    - Bulgarian (bg.po) by Ognyan Kulev
    - Bosnian (bs.po) by Safir Šećerović
@@ -1897,7 +1908,7 @@ partman-auto (31) unstable; urgency=low
    - Turkish (tr.po) by Recai Oktaş
    - Ukrainian (uk.po) by Eugeniy Meshcheryakov
    - Simplified Chinese (zh_CN.po) by Carlos Z.F. Liu
-  
+
 -- Joey Hess <joeyh@debian.org>  Mon, 30 Aug 2004 12:13:24 -0400

 partman-auto (30) unstable; urgency=low

--- a/debian/control
+++ b/debian/control
 Source: partman-auto
 Section: debian-installer
 Priority: standard
-Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
-Uploaders: Christian Perrier <bubulle@debian.org>, John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>, Steve McIntyre <93sam@debian.org>
+Maintainer: Parrot Dev Team <team@parrotsec.org>
+Uploaders: Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org>
 Build-Depends: debhelper (>= 9), dh-di, po-debconf (>= 0.5.0)
-Vcs-Browser: https://salsa.debian.org/installer-team/partman-auto
-Vcs-Git: https://salsa.debian.org/installer-team/partman-auto.git
+Vcs-Browser: https://nest.parrotsec.org/debian-packages/debian-installer/partman-auto
+Vcs-Git: https://nest.parrotsec.org/debian-packages/debian-installer/partman-auto.git

 Package: partman-auto
 Package-Type: udeb

--- a/debian/po/fi.po
+++ b/debian/po/fi.po
@@ -13,6 +13,8 @@
 # Tapio Lehtonen <tale@debian.org>, 2004 - 2006.
 # Esko Arajärvi <edu@iki.fi>, 2007 - 2008, 2009, 2010.
 # Timo Jyrinki <timo.jyrinki@iki.fi>, 2012.
+# Juhani Numminen <juhaninumminen0@gmail.com>, 2018.
+# Arto Keiski <arto.keiski@iki.fi>, 2018.
 #
 # Translations from iso-codes:
 # Copyright (C) 2007 Tobias Toedter <t.toedter@gmx.net>.
@@ -25,14 +27,14 @@ msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: partman-auto@packages.debian.org\n"
 "POT-Creation-Date: 2014-09-25 22:00+0000\n"
-"PO-Revision-Date: 2013-08-19 15:04+0300\n"
-"Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
+"PO-Revision-Date: 2018-12-19 23:08+0000\n"
+"Last-Translator: Juhani Numminen <juhaninumminen0@gmail.com>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"

 #. Type: text
 #. Description
@@ -78,7 +80,7 @@ msgid ""
 "the partition table."
 msgstr ""
 "Luultavimmin näin kävi koska levyn osiotaulussa on liian monta (ensisijaista "
-"eli primary) osiota. "
+"eli primary) osiota."

 #. Type: select
 #. Description
@@ -257,4 +259,4 @@ msgstr "Erilliset /home, /var, ja /tmp -levyosiot"
 #. TRANSLATORS: This is a menu entry. Keep in under 55 columns/characters
 #: ../partman-auto.templates:22001
 msgid "Small-disk (< 1GB) partitioning scheme"
-msgstr "Pienen levyn (< 1 Gt) osiointimalline:"
+msgstr "Pienen levyn (< 1 Gt) osiointimalline"
--- a/debian/po/zh_TW.po
+++ b/debian/po/zh_TW.po
@@ -31,14 +31,15 @@ msgstr ""
 "Project-Id-Version: debian-installer\n"
 "Report-Msgid-Bugs-To: partman-auto@packages.debian.org\n"
 "POT-Creation-Date: 2014-09-25 22:00+0000\n"
-"PO-Revision-Date: 2013-09-30 14:59+0800\n"
-"Last-Translator: Yao Wei (魏銘廷) <mwei@lxde.org>\n"
+"PO-Revision-Date: 2019-01-13 14:06+0000\n"
+"Last-Translator: Louies <louies0623@gmail.com>\n"
 "Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
 "debian.org>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"

 #. Type: text
 #. Description
@@ -62,7 +63,7 @@ msgstr "正在計算新的分割區……"
 #. :sl2:
 #: ../partman-auto.templates:3001 ../partman-auto.templates:4001
 msgid "Failed to partition the selected disk"
-msgstr "無法分割所選定的磁碟。"
+msgstr "無法分割所選定的磁碟"

 #. Type: error
 #. Description

--- a/lib/recipes.sh
+++ b/lib/recipes.sh
@@ -121,7 +121,7 @@ decode_recipe () {
 				max=$min
 			fi
 			case "$4" in # allow only valid file systems
-			    ext2|ext3|ext4|xfs|jfs|linux-swap|fat16|fat32|hfs|ufs)
+			    ext2|ext3|ext4|xfs|btrfs|jfs|linux-swap|fat16|fat32|hfs|ufs)
 				fs="$4"
 				;;
 			    \$default_filesystem)
@@ -129,7 +129,7 @@ decode_recipe () {
 				fs="$RET"
 				;;
 			    *)
-				fs=ext2
+				fs=ext4
 				;;
 			esac
 			shift; shift; shift; shift
@@ -453,11 +453,11 @@ expand_scheme() {
 		max=$3
 		fs=$4
 		case "$fs" in
-		    ext2|ext3|ext4|linux-swap|fat16|fat32|hfs)
+		    ext2|ext3|ext4|btrfs|xfs|linux-swap|fat16|fat32|hfs)
 			true
 			;;
 		    *)
-			fs=ext2
+			fs=ext4
 			;;
 		esac
 		shift; shift; shift; shift

--- a/recipes-amd64-efi/atomic
+++ b/recipes-amd64-efi/atomic
@@ -6,18 +6,25 @@ partman-auto/text/atomic_scheme ::
 	method{ efi }
 	format{ } .

-500 600 700 ext2
-	$defaultignore{ }
+384 512 640 ext4
 	method{ format }
 	format{ }
+	label{ boot }
 	use_filesystem{ }
-	filesystem{ ext2 }
+	filesystem{ ext4 }
 	mountpoint{ /boot } .

-8000 12000 -1 btrfs
+10000 30000 -1 btrfs
 	$lvmok{ }
 	method{ format }
 	format{ }
+	label{ parrot-system }
+	options/autodefrag{ autodefrag }
+	options/nodatacow{ nodatacow }
+	options/discard{ discard }
+	options/noatime{ noatime }
+	options/nodiratime{ nodiratime }
+	options/compress{ compress=zstd }
 	use_filesystem{ }
 	filesystem{ btrfs }
 	mountpoint{ / } .
--- a/recipes-amd64-efi/home
+++ b/recipes-amd64-efi/home
@@ -6,26 +6,37 @@ partman-auto/text/home_scheme ::
 	method{ efi }
 	format{ } .

-500 600 700 ext2
-	$defaultignore{ }
+384 512 640 ext4
 	method{ format }
 	format{ }
+	label{ boot }
 	use_filesystem{ }
-	filesystem{ ext2 }
+	filesystem{ ext4 }
 	mountpoint{ /boot } .

-8000 12000 40000 btrfs
+13000 20000 40000 xfs
 	$lvmok{ }
 	method{ format }
 	format{ }
+	label{ parrot-system }
 	use_filesystem{ }
-	filesystem{ btrfs }
+	options/discard{ discard }
+	options/noatime{ noatime }
+	options/nodiratime{ nodiratime }
+	filesystem{ xfs }
 	mountpoint{ / } .

-4000 10000 -1 btrfs
+5000 10000 -1 btrfs
 	$lvmok{ }
 	method{ format }
 	format{ }
+	label{ parrot-home }
+	options/autodefrag{ autodefrag }
+	options/nodatacow{ nodatacow }
+	options/discard{ discard }
+	options/noatime{ noatime }
+	options/nodiratime{ nodiratime }
+	options/compress{ compress=zstd }
 	use_filesystem{ }
 	filesystem{ btrfs }
 	mountpoint{ /home } .

--- a/recipes-amd64-efi/multi
+++ b/recipes-amd64-efi/multi
@@ -6,43 +6,60 @@ partman-auto/text/multi_scheme ::
 	method{ efi }
 	format{ } .

-500 600 700 ext2
-	$defaultignore{ }
+384 512 640 ext4
 	method{ format }
 	format{ }
+	label{ boot }
 	use_filesystem{ }
-	filesystem{ ext2 }
+	filesystem{ ext4 }
 	mountpoint{ /boot } .

-8000 12000 25000 btrfs
+15000 20000 40000 xfs
 	$lvmok{ }
 	method{ format }
 	format{ }
+	label{ parrot-system }
+	options/discard{ discard }
+	options/noatime{ noatime }
+	options/nodiratime{ nodiratime }
 	use_filesystem{ }
-	$default_filesystem{ }
+	filesystem{ xfs }
 	mountpoint{ / } .

-4000 8000 20000 btrfs
+1024 4096 16384 btrfs
 	$lvmok{ }
 	method{ format }
 	format{ }
+	label{ parrot-opt }
+	options/autodefrag{ autodefrag }
+	options/nodatacow{ nodatacow }
+	options/discard{ discard }
+	options/noatime{ noatime }
+	options/nodiratime{ nodiratime }
+	options/compress{ compress=zstd }
 	use_filesystem{ }
 	filesystem{ btrfs }
-	mountpoint{ /var } .
-
-256 400 2000 $default_filesystem
-	$lvmok{ }
-	method{ format }
-	format{ }
-	use_filesystem{ }
-	$default_filesystem{ }
-	mountpoint{ /tmp } .
+	mountpoint{ /opt } .

-4000 10000 -1 xfs
+4000 10000 -1 btrfs
 	$lvmok{ }
 	method{ format }
 	format{ }
+	label{ parrot-home }
+	options/autodefrag{ autodefrag }
+	options/nodatacow{ nodatacow }
+	options/discard{ discard }
+	options/noatime{ noatime }
+	options/nodiratime{ nodiratime }
+	options/compress{ compress=zstd }
 	use_filesystem{ }
 	filesystem{ btrfs }
 	mountpoint{ /home } .

+100% 512 200% linux-swap
+	$lvmok{ }
+	$reusemethod{ }
+	$defaultignore{ }
+	method{ swap }
+	format{ } .
+
--- a/recipes/atomic
+++ b/recipes/atomic
@@ -5,18 +5,25 @@ partman-auto/text/atomic_scheme ::
 	$reusemethod{ }
 	method{ biosgrub } .

-400 500 600 ext2
-	$defaultignore{ }
+384 512 640 ext4
 	method{ format }
 	format{ }
+	label{ boot }
 	use_filesystem{ }
-	filesystem{ ext2 }
+	filesystem{ ext4 }
 	mountpoint{ /boot } .

-8000 12000 -1 btrfs
+10000 30000 -1 btrfs
 	$lvmok{ }
 	method{ format }
 	format{ }
+	label{ parrot-system }
+	options/autodefrag{ autodefrag }
+	options/nodatacow{ nodatacow }
+	options/discard{ discard }
+	options/noatime{ noatime }
+	options/nodiratime{ nodiratime }
+	options/compress{ compress=zstd }
 	use_filesystem{ }
 	filesystem{ btrfs }
 	mountpoint{ / } .
@@ -24,5 +31,6 @@ partman-auto/text/atomic_scheme ::
 100% 512 200% linux-swap
 	$lvmok{ }
 	$reusemethod{ }
+	$defaultignore{ }
 	method{ swap }
 	format{ } .
--- a/recipes/home
+++ b/recipes/home
@@ -5,33 +5,44 @@ partman-auto/text/home_scheme ::
 	$reusemethod{ }
 	method{ biosgrub } .

-400 500 600 ext2
-	$defaultignore{ }
+384 512 640 ext4
 	method{ format }
 	format{ }
+	label{ boot }
 	use_filesystem{ }
-	filesystem{ ext2 }
+	filesystem{ ext4 }
 	mountpoint{ /boot } .

-8000 16000 40000 btrfs
+13000 20000 40000 xfs
 	$lvmok{ }
 	method{ format }
 	format{ }
+	label{ parrot-system }
 	use_filesystem{ }
-	filesystem{ btrfs }
+	options/discard{ discard }
+	options/noatime{ noatime }
+	options/nodiratime{ nodiratime }
+	filesystem{ xfs }
 	mountpoint{ / } .

-100% 512 200% linux-swap
-	$lvmok{ }
-	$reusemethod{ }
-	method{ swap }
-	format{ } .
-
-4000 10000 -1 xfs
+5000 10000 -1 btrfs
 	$lvmok{ }
 	method{ format }
 	format{ }
+	label{ parrot-home }
+	options/autodefrag{ autodefrag }
+	options/nodatacow{ nodatacow }
+	options/discard{ discard }
+	options/noatime{ noatime }
+	options/nodiratime{ nodiratime }
+	options/compress{ compress=zstd }
 	use_filesystem{ }
-	filesystem{ xfs }
+	filesystem{ btrfs }
 	mountpoint{ /home } .

+100% 512 200% linux-swap
+	$lvmok{ }
+	$reusemethod{ }
+	$defaultignore{ }
+	method{ swap }
+	format{ } .
--- a/recipes/multi
+++ b/recipes/multi
@@ -5,49 +5,60 @@ partman-auto/text/multi_scheme ::
 	$reusemethod{ }
 	method{ biosgrub } .

-400 500 600 ext2
-	$defaultignore{ }
+384 512 640 ext4
 	method{ format }
 	format{ }
+	label{ boot }
 	use_filesystem{ }
-	filesystem{ ext2 }
+	filesystem{ ext4 }
 	mountpoint{ /boot } .

-6000 10000 20000 btrfs
+15000 20000 40000 xfs
 	$lvmok{ }
 	method{ format }
 	format{ }
+	label{ parrot-system }
+	options/discard{ discard }
+	options/noatime{ noatime }
+	options/nodiratime{ nodiratime }
 	use_filesystem{ }
-	filesystem{ btrfs }
+	filesystem{ xfs }
 	mountpoint{ / } .

-8000 12000 20000 btrfs
+1024 4096 16384 btrfs
 	$lvmok{ }
 	method{ format }
 	format{ }
+	label{ parrot-opt }
+	options/autodefrag{ autodefrag }
+	options/nodatacow{ nodatacow }
+	options/discard{ discard }
+	options/noatime{ noatime }
+	options/nodiratime{ nodiratime }
+	options/compress{ compress=zstd }
 	use_filesystem{ }
 	filesystem{ btrfs }
-	mountpoint{ /var } .
+	mountpoint{ /opt } .

-100% 512 200% linux-swap
-	$lvmok{ }
-	$reusemethod{ }
-	method{ swap }
-	format{ } .
-
-256 400 2000 btrfs
+4000 10000 -1 btrfs
 	$lvmok{ }
 	method{ format }
 	format{ }
+	label{ parrot-home }
+	options/autodefrag{ autodefrag }
+	options/nodatacow{ nodatacow }
+	options/discard{ discard }
+	options/noatime{ noatime }
+	options/nodiratime{ nodiratime }
+	options/compress{ compress=zstd }
 	use_filesystem{ }
-	$default_filesystem{ }
-	mountpoint{ /tmp } .
+	filesystem{ btrfs }
+	mountpoint{ /home } .

-4000 10000 -1 xfs
+100% 512 200% linux-swap
 	$lvmok{ }
-	method{ format }
-	format{ }
-	use_filesystem{ }
-	filesystem{ xfs }
-	mountpoint{ /home } .
+	$reusemethod{ }
+	$defaultignore{ }
+	method{ swap }
+	format{ } .