hostname-wordlist: replace "petnames" wordlists
The petnames wordlist added in [1] is Apache-2.0 and this causes problems with the distribution of systemd as the GPL-2 and Apache-2.0 are considered incompatible by the FSF. So this commit replaces the previous wordlist with a new one: - weather (basic english weather adjectives) - colors (basic english color names) - worlds (planets, moons, minor bodies of the solar system) All common vocabulary and compiled for this project, not taken from anywhere. An example with the new list: - wintry-rust-dione-9393 - warm-yellow-saturn-39f9 The "worlds" are picked on the following principles: - well-known - memorable - short(ish) - cool This is why e.g. we have "thetis" (an astroid) instead of "tethys" (a moon): easier to spell and more well known. [1] https://github.com/systemd/systemd/pull/42566
This commit is contained in:
committed by
Zbigniew Jędrzejewski-Szmek
parent
a11144d0a9
commit
3b4c759a07
+1
-1
@@ -58,7 +58,7 @@
|
||||
cryptographic hashing. Each <literal>$</literal> is positional: the first <literal>$</literal> uses the word
|
||||
list file named <filename>1</filename>, the second <filename>2</filename>, and so on. This allows
|
||||
human-friendly names, for example <literal>$-$-$-????</literal> might expand to
|
||||
<literal>wildly-happy-octopus-92a9</literal>. The word lists are searched for in
|
||||
<literal>sunny-red-europa-92a9</literal>. The word lists are searched for in
|
||||
<filename>/etc/systemd/hostname-wordlist/</filename>, <filename>/run/systemd/hostname-wordlist/</filename>,
|
||||
<filename>/usr/local/lib/systemd/hostname-wordlist/</filename> and
|
||||
<filename>/usr/lib/systemd/hostname-wordlist/</filename> (the first directory providing a given list wins,
|
||||
|
||||
Reference in New Issue
Block a user