From b637f8d2206a7368969dd0388c9cb3e4ae2656d6 Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Mon, 4 Feb 2019 15:29:07 +0100 Subject: [PATCH] Add a sixth' option --- 914897_merged_usr/ballot.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/914897_merged_usr/ballot.md b/914897_merged_usr/ballot.md index d618d95..6f63671 100644 --- a/914897_merged_usr/ballot.md +++ b/914897_merged_usr/ballot.md @@ -52,12 +52,13 @@ Two initiatives are worth mentioning at this point: Various valid long-term desireable situations coexist, and while discussing immediate countermeasures, it is useful to keep the long-term outcome that those are most likely to produce. -These are the five possible situations at the time of bullseye (buster + 1): +These are the six possible situations at the time of bullseye (buster + 1): * `none`: "merged `/usr`" has been reverted * `weak`: both directory schemes are allowed, packages only built on classical hosts -* `hard`: both directory schemes are allowed, packages can be built anywhere -* `all` : only "merged `/usr`" directory schemes are allowed, packages only built on "merged `/usr`" hosts +* `middle`: both directory schemes are allowed, packages can be built anywhere +* `hard`: both directory schemes are allowed, packages only built on "merged `/usr`" hosts +* `all`: only "merged `/usr`" directory schemes are allowed, packages only built on "merged `/usr`" hosts * `full`: only "merged `/usr`" directory schemes are allowed, symlinks have been removed It can be summarized by the following table: @@ -68,7 +69,8 @@ It can be summarized by the following table: |----------|-----------------|-------------------|------------------|—----------------|-------------------|---------------------|----------------------| | none | yes | no | no | yes | no | yes | yes | | weak | yes | yes | yes | yes | no | no | yes | -| hard | yes | yes | yes | yes | yes | no | no | +| middle | yes | yes | yes | yes | yes | no | no | +| hard | yes | yes | yes | no | yes | no | no | | all | no | yes | yes | no | yes | yes | no | | full | no | yes | no | no | yes | yes | yes | ``` -- 2.39.2