Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package barrel for openSUSE:Factory checked in at 2023-10-10 21:00:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/barrel (Old) and /work/SRC/openSUSE:Factory/.barrel.new.28202 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "barrel" Tue Oct 10 21:00:48 2023 rev:18 rq:1116614 version:0.2.3 Changes: -------- --- /work/SRC/openSUSE:Factory/barrel/barrel.changes 2023-09-21 22:23:09.309097881 +0200 +++ /work/SRC/openSUSE:Factory/.barrel.new.28202/barrel.changes 2023-10-10 21:02:14.710314084 +0200 @@ -1,0 +2,6 @@ +Fri Oct 06 12:38:56 CEST 2023 - aschn...@suse.com + +- allow to use a key file when creating an encryption device +- version 0.2.3 + +------------------------------------------------------------------- Old: ---- barrel-0.2.2.tar.xz New: ---- barrel-0.2.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ barrel.spec ++++++ --- /var/tmp/diff_new_pack.UFAJtd/_old 2023-10-10 21:02:15.762352234 +0200 +++ /var/tmp/diff_new_pack.UFAJtd/_new 2023-10-10 21:02:15.766352380 +0200 @@ -17,7 +17,7 @@ Name: barrel -Version: 0.2.2 +Version: 0.2.3 Release: 0 Summary: Tool for storage management License: GPL-2.0-only ++++++ barrel-0.2.2.tar.xz -> barrel-0.2.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.2/VERSION new/barrel-0.2.3/VERSION --- old/barrel-0.2.2/VERSION 2023-09-21 08:52:33.000000000 +0200 +++ new/barrel-0.2.3/VERSION 2023-10-06 12:45:59.000000000 +0200 @@ -1 +1 @@ -0.2.2 +0.2.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.2/barrel/Utils/Prompt.cc new/barrel-0.2.3/barrel/Utils/Prompt.cc --- old/barrel-0.2.2/barrel/Utils/Prompt.cc 2022-10-20 10:30:55.000000000 +0200 +++ new/barrel-0.2.3/barrel/Utils/Prompt.cc 2023-10-06 12:45:59.000000000 +0200 @@ -37,7 +37,6 @@ { while (true) { - // TRANSLATORS: Abbriviation for "yes". Translation must be different from // translation for "n" ("no"). string y = _("y"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.2/barrel/create-encryption.cc new/barrel-0.2.3/barrel/create-encryption.cc --- old/barrel-0.2.2/barrel/create-encryption.cc 2022-08-04 11:29:34.000000000 +0200 +++ new/barrel-0.2.3/barrel/create-encryption.cc 2023-10-06 12:45:59.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) [2021-2022] SUSE LLC + * Copyright (c) [2021-2023] SUSE LLC * * All Rights Reserved. * @@ -49,6 +49,8 @@ { "label", required_argument, 0, _("set label of device"), "label" }, { "pool-name", required_argument, 0, _("pool name"), "name" }, { "size", required_argument, 's', _("set size"), "size" }, + { "key-file", required_argument, 0, _("set a key file") }, + { "no-crypttab", no_argument, 0, _("do not add in /etc/crypttab") }, { "force", no_argument, 0, _("force if block devices are in use") } }, TakeBlkDevices::MAYBE); @@ -68,6 +70,8 @@ optional<string> label; optional<string> pool_name; optional<SmartSize> size; + optional<string> key_file; + bool crypttab = true; bool force = false; vector<string> blk_devices; @@ -111,6 +115,11 @@ size = SmartSize(str); } + if (parsed_opts.has_option("key-file")) + key_file = parsed_opts.get("key-file"); + + crypttab = !parsed_opts.has_option("no-crypttab"); + force = parsed_opts.has_option("force"); blk_devices = parsed_opts.get_blk_devices(); @@ -251,10 +260,15 @@ check_usable(blk_device, options.force); - string password = prompt_password(true); + string password = !options.key_file ? prompt_password(true) : ""; Encryption* encryption = blk_device->create_encryption(dm_name, type); - encryption->set_password(password); + if (!options.key_file) + encryption->set_password(password); + else + encryption->set_key_file(options.key_file.value()); + + encryption->set_in_etc_crypttab(options.crypttab); if (options.label && is_luks(encryption)) to_luks(encryption)->set_label(options.label.value()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.2/doc/barrel.xml.in new/barrel-0.2.3/doc/barrel.xml.in --- old/barrel-0.2.2/doc/barrel.xml.in 2023-09-21 08:52:33.000000000 +0200 +++ new/barrel-0.2.3/doc/barrel.xml.in 2023-10-06 12:45:59.000000000 +0200 @@ -2,13 +2,13 @@ <refentry id='barrel8' xmlns:xlink="http://www.w3.org/1999/xlink"> <refentryinfo> - <date>2023-09-21</date> + <date>2023-10-06</date> </refentryinfo> <refmeta> <refentrytitle>barrel</refentrytitle> <manvolnum>8</manvolnum> - <refmiscinfo class='date'>2023-09-21</refmiscinfo> + <refmiscinfo class='date'>2023-10-06</refmiscinfo> <refmiscinfo class='version'>@VERSION@</refmiscinfo> <refmiscinfo class='manual'>Storage Management</refmiscinfo> </refmeta> @@ -265,6 +265,19 @@ </listitem> </varlistentry> <varlistentry> + <term><option>--key-file</option></term> + <listitem> + <para>Set a key file. The key file is used during commit and + in /etc/crypttab. Also the key file must already exist.</para> + </listitem> + </varlistentry> + <varlistentry> + <term><option>--no-crypttab</option></term> + <listitem> + <para>Do not add the encryption in /etc/crypttab.</para> + </listitem> + </varlistentry> + <varlistentry> <term><option>--force</option></term> <listitem> <para>Force creation if block device is in use.</para> @@ -605,7 +618,7 @@ <varlistentry> <term><option>-l, --level</option> <replaceable>level</replaceable></term> <listitem> - <para>Set RAID level. Possible values are 0, stripe, 1, + <para>Set RAID level. Possible values are linear, 0, stripe, 1, mirror, 4, 5, 6 and 10.</para> </listitem> </varlistentry> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.2/po/ca.po new/barrel-0.2.3/po/ca.po --- old/barrel-0.2.2/po/ca.po 2023-09-21 09:06:03.000000000 +0200 +++ new/barrel-0.2.3/po/ca.po 2023-10-10 06:56:35.000000000 +0200 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: barrel VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-21 08:53+0200\n" -"PO-Revision-Date: 2023-07-24 10:15+0000\n" +"POT-Creation-Date: 2023-10-06 12:47+0200\n" +"PO-Revision-Date: 2023-10-06 14:15+0000\n" "Last-Translator: David Medina <medi...@gmail.com>\n" "Language-Team: Catalan <https://l10n.opensuse.org/projects/barrel/master/ca/>" "\n" @@ -327,7 +327,8 @@ #, c-format msgid "Setting id of partition %s from unsupported value to %s." -msgstr "Es configura l'identificador de la partició %s del valor no admès a %s." +msgstr "" +"Es configura l'identificador de la partició %s del valor no admès a %s." msgid "Shows DASDs." msgstr "Mostra DASDs." @@ -474,8 +475,11 @@ msgid "device '%s' not found in mapping" msgstr "el dispositiu %s no s'ha trobat al mapatge" +msgid "do not add in /etc/crypttab" +msgstr "no ho afegeixis a /etc/crypttab" + msgid "do not add in /etc/fstab" -msgstr "" +msgstr "no ho afegeixis a /etc/fstab" msgid "do not commit anything to disk" msgstr "no apliquis res al disc" @@ -865,6 +869,9 @@ msgid "set RAID name" msgstr "estableix el nom de RAID" +msgid "set a key file" +msgstr "estableix un fitxer de clau" + msgid "set chunk size" msgstr "estableix la mida del tros" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.2/po/cs.po new/barrel-0.2.3/po/cs.po --- old/barrel-0.2.2/po/cs.po 2023-09-21 09:06:03.000000000 +0200 +++ new/barrel-0.2.3/po/cs.po 2023-10-10 06:56:35.000000000 +0200 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-21 08:53+0200\n" -"PO-Revision-Date: 2023-06-02 22:15+0000\n" +"POT-Creation-Date: 2023-10-06 12:47+0200\n" +"PO-Revision-Date: 2023-10-08 13:15+0000\n" "Last-Translator: AleÅ¡ Kastner <al...@volny.cz>\n" "Language-Team: Czech <https://l10n.opensuse.org/projects/barrel/master/cs/>\n" "Language: cs\n" @@ -220,9 +220,8 @@ msgid "Loads pools." msgstr "Zavádà zásobnÃky." -#, fuzzy msgid "Loads the staging devicegraph from a file." -msgstr "Zavádà inscenujÃcà devicegraf ze souboru." +msgstr "Zavádà stavovou mapu zaÅÃzenà ze souboru." #, c-format msgid "MS-DOS on %s" @@ -310,9 +309,8 @@ msgid "Renames pool." msgstr "PÅejmenuje zásobárnu." -#, fuzzy msgid "Restores the staging devicegraph to the last backup." -msgstr "Obnovà inscenujÃcà devicegraf z poslednà zálohy." +msgstr "Obnovà stavovou mapu zaÅÃzenà z poslednà zálohy." msgid "Save pools" msgstr "Uložà zásobárny" @@ -320,9 +318,8 @@ msgid "Saves pools." msgstr "Uložà zásobárny." -#, fuzzy msgid "Saves the devicegraph to a file." -msgstr "Uložà inscenaÄnà devicegraf do souboru." +msgstr "Uložà mapu zaÅÃzenà do souboru." msgid "Saving pools..." msgstr "Ukládám zásobárny..." @@ -340,20 +337,17 @@ msgid "Shows RAIDs." msgstr "Ukáže RAIDy." -#, fuzzy msgid "Shows actiongraph." msgstr "Ukáže graf akce." -#, fuzzy msgid "Shows commit actions." -msgstr "Ukáže potvrzené akce." +msgstr "Ukáže potvrzujÃcà akce." msgid "Shows device tree." msgstr "Ukáže strom zaÅÃzenÃ." -#, fuzzy msgid "Shows devicegraph." -msgstr "Ukáže devicegraf." +msgstr "Ukáže mapu zaÅÃzenÃ." msgid "Shows disks." msgstr "Ukáže disky." @@ -364,7 +358,6 @@ msgid "Shows filesystems." msgstr "Ukáže systémy souborů." -#, fuzzy msgid "Shows multipath devices." msgstr "Ukáže vÃcecestná zaÅÃzenÃ." @@ -374,7 +367,6 @@ msgid "Size" msgstr "Velikost" -#, fuzzy msgid "Stripes" msgstr "Proužky" @@ -382,7 +374,6 @@ msgstr "PÅÃkaz má následujÃcà dÃlÄà pÅÃkazy:" #. TRANSLATORS: transport layer/bus of a disk, e.g. SATA or USB -#, fuzzy msgid "Transport" msgstr "Transport" @@ -482,241 +473,245 @@ msgid "device '%s' not found in mapping" msgstr "zaÅÃzenà '%s' nenalezeno v mapovánÃ" +msgid "do not add in /etc/crypttab" +msgstr "nepÅidat do /etc/crypttab" + msgid "do not add in /etc/fstab" -msgstr "" +msgstr "nepÅidat do /etc/fstab" msgid "do not commit anything to disk" -msgstr "" +msgstr "nic nepotvrdit na disk" msgid "do not show colors" -msgstr "" +msgstr "neukázat barvy" msgid "do not show partitions on DASDs" -msgstr "" +msgstr "neukázat oddÃly na zaÅÃzenÃch DASD" msgid "do not show partitions on RAIDs" -msgstr "" +msgstr "neukázat oddÃly na zaÅÃzenÃch RAID" #. TRANSLATORS: help text msgid "do not show partitions on disks" -msgstr "" +msgstr "neukázat oddÃly na discÃch" msgid "do not show partitions on multipath devices" -msgstr "" +msgstr "neukázat oddÃly na vÃcecestných zaÅÃzenÃch" msgid "done" -msgstr "" +msgstr "hotovo" #, c-format msgid "element of array for '%s' not string" -msgstr "" +msgstr "prvek pole '%s' nenà ÅetÄzec" #, c-format msgid "element of devices array for '%s' not string" -msgstr "" +msgstr "prvek pole zaÅÃzenà '%s' nenà ÅetÄzec" msgid "encryption type" -msgstr "" +msgstr "typ Å¡ifrovánÃ" msgid "encryption type already set for command 'encryption'" -msgstr "" +msgstr "typ Å¡ifrovánà pro pÅÃkaz 'encryption' je již nastaven" msgid "encryption type missing for command 'encryption'" -msgstr "" +msgstr "chybà typ Å¡ifrovánà pro pÅÃkaz 'encryption'" msgid "error:" -msgstr "" +msgstr "chyba:" #, c-format msgid "excessive content in json file '%s'" -msgstr "" +msgstr "nadbyteÄný obsah souboru json '%s'" msgid "failed to calculate actions" -msgstr "" +msgstr "nepodaÅilo se vypoÄÃtat akce" #, c-format msgid "failed to parse size '%s'" -msgstr "" +msgstr "nepodaÅilo se zpracovat velikost '%s'" #, c-format msgid "filesystem %s on %s" -msgstr "" +msgstr "systém souborů %s na %s" msgid "filesystem type already set for command 'filesystem'" -msgstr "" +msgstr "typ souborového systému pro pÅÃkaz 'filesystem' je již nastaven" msgid "filesystem type missing for command 'filesystem'" -msgstr "" +msgstr "chybà typ souborového systému pro pÅÃkaz 'filesystem'" msgid "force if block device is in use" -msgstr "" +msgstr "násilnÄ, pokud se blokové zaÅÃzenà použÃvá" msgid "force if block devices are in use" -msgstr "" +msgstr "násilnÄ, pokud se bloková zaÅÃzenà použÃvajÃ" msgid "go downwards" -msgstr "" +msgstr "smÄrem dolů" msgid "go upwards" -msgstr "" +msgstr "smÄrem nahoru" #, c-format msgid "invalid devices value '%d'" -msgstr "" +msgstr "neplatná hodnota zaÅÃzenà '%d'" msgid "invalid logical volume name for command 'lv'" -msgstr "" +msgstr "neplatný název logického svazku pro pÅÃkaz 'lv'" #, c-format msgid "invalid path '%s'" -msgstr "" +msgstr "neplatná cesta '%s'" #, c-format msgid "invalid size '%s'" -msgstr "" +msgstr "neplatná velikost '%s'" msgid "invalid volume group name for command 'vg'" -msgstr "" +msgstr "neplatný název skupiny svazků pro pÅÃkaz 'vg'" msgid "keep underlying partitions" -msgstr "" +msgstr "zachovat podÅazené oddÃly" #, c-format msgid "mapped DASD for '%s' has different format" -msgstr "" +msgstr "mapované zaÅÃzenà DASD pro '%s' má jiný formát" #, c-format msgid "mapped DASD for '%s' has different type" -msgstr "" +msgstr "mapované zaÅÃzenà DASD pro '%s' má jiný typ" #, c-format msgid "mapped DASD for '%s' mapped twice" -msgstr "" +msgstr "namapovaný DASD pro '%s' je mapován dvakrát" #, c-format msgid "mapped DM RAID for '%s' mapped twice" -msgstr "" +msgstr "namapovaný DM RAID pro '%s' je mapován dvakrát" #, c-format msgid "mapped device for '%s' has different block size" -msgstr "" +msgstr "zaÅÃzenà mapované pro '%s' má jinou velikost bloku" #, c-format msgid "mapped device for '%s' is not a DASD" -msgstr "" +msgstr "zaÅÃzenà mapované pro '%s' nenà typu DASD" #, c-format msgid "mapped device for '%s' is not a DM RAID" -msgstr "" +msgstr "zaÅÃzenà mapované pro '%s' nenà typu DM RAID" #, c-format msgid "mapped device for '%s' is not a disk" -msgstr "" +msgstr "zaÅÃzenà mapované pro '%s' nenà disk" #, c-format msgid "mapped device for '%s' is not a multipath" -msgstr "" +msgstr "mapované zaÅÃzenà pro '%s' nenà vÃcecestné" #, c-format msgid "mapped device for '%s' is smaller" -msgstr "" +msgstr "mapované zaÅÃzenà pro '%s' je menÅ¡Ã" #, c-format msgid "mapped device for '%s' not found" -msgstr "" +msgstr "mapované zaÅÃzenà pro '%s' nenalezeno" #, c-format msgid "mapped disk for '%s' mapped twice" -msgstr "" +msgstr "mapovaný disk pro '%s' namapován dvakrát" #, c-format msgid "mapped multipath for '%s' mapped twice" -msgstr "" +msgstr "mapovaná vÃcecestná cesta pro '%s' mapována dvakrát" #, c-format msgid "mapping %s to %s" -msgstr "" +msgstr "mapuji %s na %s" #, c-format msgid "mapping not found in json file '%s'" -msgstr "" +msgstr "v souboru json '%s' nebylo nalezeno mapovánÃ" msgid "missing block device" -msgstr "" +msgstr "chybà blokové zaÅÃzenÃ" msgid "missing partitionable" -msgstr "" +msgstr "chybÄjÃcà dÄlitelný na oddÃly" msgid "mkfs options" -msgstr "" +msgstr "volby pro mkfs" +#, fuzzy msgid "mount by" -msgstr "" +msgstr "pÅipojit" msgid "mount options" -msgstr "" +msgstr "volby pÅipojenÃ" msgid "mount options require a path" -msgstr "" +msgstr "možnosti pÅipojenà vyžadujà zadánà cesty" msgid "mount path" -msgstr "" +msgstr "cesta pro pÅipojenÃ" msgid "mount-by requires a path" -msgstr "" +msgstr "mount-by vyžaduje zadat cestu" msgid "multiple devices" -msgstr "" +msgstr "vÃce zaÅÃzenÃ" #. TRANSLATORS: Abbriviation for "no". Translation must be different from #. translation for "y" ("yes"). msgid "n" -msgstr "" +msgstr "n" msgid "name missing for command 'devicegraph'" -msgstr "" +msgstr "chybà název pro pÅÃkaz 'devicegraph'" msgid "name missing for command 'encryption'" -msgstr "" +msgstr "chybà název pro pÅÃkaz 'encryption'" msgid "name missing for command 'lv'" -msgstr "" +msgstr "chybà název pro pÅÃkaz 'lv'" msgid "name missing for command 'vg'" -msgstr "" +msgstr "chybà název pro pÅÃkaz 'vg'" msgid "name of RAID already exists" -msgstr "" +msgstr "název pro RAID již existuje" msgid "name of devicegraph" -msgstr "" +msgstr "název pro mapu zaÅÃzenÃ" msgid "name of devicegraph file" -msgstr "" +msgstr "název souboru s mapou zaÅÃzenÃ" msgid "name of logical volume already exists" -msgstr "" +msgstr "název logického svazku již existuje" msgid "name of mapping file" -msgstr "" +msgstr "název mapovacÃho souboru" msgid "name of new pool" -msgstr "" +msgstr "název nové zásobárny" msgid "name of pool" -msgstr "" +msgstr "název zásobárny" msgid "name of pool to use" -msgstr "" +msgstr "název zásobárny k použitÃ" msgid "name of volume group" -msgstr "" +msgstr "název skupiny svazků" msgid "name of volume group already exists" -msgstr "" +msgstr "název skupiny svazků již existuje" msgid "new name" -msgstr "" +msgstr "nový název" #. TRANSLATORS: error message msgid "no backup available for undo" @@ -865,6 +860,9 @@ msgid "set RAID name" msgstr "" +msgid "set a key file" +msgstr "" + msgid "set chunk size" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.2/po/da.po new/barrel-0.2.3/po/da.po --- old/barrel-0.2.2/po/da.po 2023-09-21 09:06:03.000000000 +0200 +++ new/barrel-0.2.3/po/da.po 2023-10-06 12:53:35.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: barrel VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-21 08:53+0200\n" +"POT-Creation-Date: 2023-10-06 12:47+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -470,6 +470,9 @@ msgid "device '%s' not found in mapping" msgstr "" +msgid "do not add in /etc/crypttab" +msgstr "" + msgid "do not add in /etc/fstab" msgstr "" @@ -853,6 +856,9 @@ msgid "set RAID name" msgstr "" +msgid "set a key file" +msgstr "" + msgid "set chunk size" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.2/po/de.po new/barrel-0.2.3/po/de.po --- old/barrel-0.2.2/po/de.po 2023-09-21 09:06:03.000000000 +0200 +++ new/barrel-0.2.3/po/de.po 2023-10-06 12:53:35.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: barrel\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-21 08:53+0200\n" +"POT-Creation-Date: 2023-10-06 12:47+0200\n" "PO-Revision-Date: 2023-05-13 02:15+0000\n" "Last-Translator: Ettore Atalan <atalantt...@googlemail.com>\n" "Language-Team: German <https://l10n.opensuse.org/projects/barrel/master/de/" @@ -474,6 +474,9 @@ msgid "device '%s' not found in mapping" msgstr "Gerät '%s' nicht in Zuordnung gefunden" +msgid "do not add in /etc/crypttab" +msgstr "" + msgid "do not add in /etc/fstab" msgstr "" @@ -867,6 +870,10 @@ msgid "set RAID name" msgstr "RAID-Namen festlegen" +#, fuzzy +msgid "set a key file" +msgstr "Namen des Geräts festlegen" + msgid "set chunk size" msgstr "Chunk-GröÃe festlegen" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.2/po/es.po new/barrel-0.2.3/po/es.po --- old/barrel-0.2.2/po/es.po 2023-09-21 09:06:03.000000000 +0200 +++ new/barrel-0.2.3/po/es.po 2023-10-06 12:53:35.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: barrel VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-21 08:53+0200\n" +"POT-Creation-Date: 2023-10-06 12:47+0200\n" "PO-Revision-Date: 2023-02-08 23:14+0000\n" "Last-Translator: Antonio Simón <anto...@trans-mission.com>\n" "Language-Team: Spanish <https://l10n.opensuse.org/projects/barrel/master/es/" @@ -476,6 +476,9 @@ msgid "device '%s' not found in mapping" msgstr "Dispositivo «%s» no encontrado en el mapeo" +msgid "do not add in /etc/crypttab" +msgstr "" + msgid "do not add in /etc/fstab" msgstr "" @@ -869,6 +872,10 @@ msgid "set RAID name" msgstr "nombrar RAID" +#, fuzzy +msgid "set a key file" +msgstr "nombrar un dispositivo" + msgid "set chunk size" msgstr "Dimensionar el aservo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.2/po/fr.po new/barrel-0.2.3/po/fr.po --- old/barrel-0.2.2/po/fr.po 2023-09-21 09:06:03.000000000 +0200 +++ new/barrel-0.2.3/po/fr.po 2023-10-06 12:53:35.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: barrel VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-21 08:53+0200\n" +"POT-Creation-Date: 2023-10-06 12:47+0200\n" "PO-Revision-Date: 2023-02-07 18:14+0000\n" "Last-Translator: Sophie Leroy <sop...@stoquart.com>\n" "Language-Team: French <https://l10n.opensuse.org/projects/barrel/master/fr/" @@ -478,6 +478,9 @@ msgid "device '%s' not found in mapping" msgstr "périphérique '%s' introuvable dans le mappage" +msgid "do not add in /etc/crypttab" +msgstr "" + msgid "do not add in /etc/fstab" msgstr "" @@ -875,6 +878,10 @@ msgid "set RAID name" msgstr "définir le nom du RAID" +#, fuzzy +msgid "set a key file" +msgstr "définir le nom du périphérique" + msgid "set chunk size" msgstr "définir la taille de la tranche" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.2/po/it.po new/barrel-0.2.3/po/it.po --- old/barrel-0.2.2/po/it.po 2023-09-21 09:06:03.000000000 +0200 +++ new/barrel-0.2.3/po/it.po 2023-10-06 12:53:35.000000000 +0200 @@ -7,9 +7,9 @@ msgstr "" "Project-Id-Version: barrel VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-21 08:53+0200\n" -"PO-Revision-Date: 2023-02-07 13:14+0000\n" -"Last-Translator: Davide Aiello <davide.aie...@novilingulists.com>\n" +"POT-Creation-Date: 2023-10-06 12:47+0200\n" +"PO-Revision-Date: 2023-09-27 23:15+0000\n" +"Last-Translator: Giacomo Solinas <sardiniangale24+opens...@gmail.com>\n" "Language-Team: Italian <https://l10n.opensuse.org/projects/barrel/master/it/" ">\n" "Language: it\n" @@ -51,7 +51,7 @@ msgstr "Alias di 'create filesystem --type btrfs'" msgid "Alias for 'create filesystem --type exfat'" -msgstr "collegamento per 'create filesystem --type ext2'" +msgstr "Alias per 'create filesystem --type exfat'" msgid "Alias for 'create filesystem --type ext2'" msgstr "Alias di 'create filesystem --type ext2'" @@ -69,7 +69,7 @@ msgstr "Alias di 'create filesystem --type jfs'" msgid "Alias for 'create filesystem --type nilfs2'" -msgstr "Collegamento per 'create filesystem --type nilfs2'" +msgstr "Alias per 'create filesystem --type nilfs2'" msgid "Alias for 'create filesystem --type ntfs'" msgstr "Alias di 'create filesystem --type ntfs'" @@ -84,7 +84,7 @@ msgstr "Alias di 'create filesystem --type udf'" msgid "Alias for 'create filesystem --type vfat'" -msgstr "Collegametno per 'create filesystem --type vfat'" +msgstr "Alias per 'create filesystem --type vfat'" msgid "Alias for 'create filesystem --type xfs'" msgstr "Alias di 'create filesystem --type xfs'" @@ -319,7 +319,6 @@ msgid "Saves pools." msgstr "Salva i pool." -#, fuzzy msgid "Saves the devicegraph to a file." msgstr "Salva il grafico dispositivo provvisorio su un file." @@ -328,7 +327,7 @@ #, c-format msgid "Setting id of partition %s from unsupported value to %s." -msgstr "" +msgstr "Impostazione id della partizione %s da un valore non supportato su %s." msgid "Shows DASDs." msgstr "Mostra i DASD." @@ -377,7 +376,7 @@ #. TRANSLATORS: transport layer/bus of a disk, e.g. SATA or USB msgid "Transport" -msgstr "" +msgstr "Trasporto" msgid "Type" msgstr "Tipo" @@ -476,15 +475,18 @@ msgid "device '%s' not found in mapping" msgstr "dispositivo '%s' non trovato nella mappatura" +#, fuzzy +msgid "do not add in /etc/crypttab" +msgstr "no aggiungere nell /etc/fstab" + msgid "do not add in /etc/fstab" -msgstr "" +msgstr "no aggiungere nell /etc/fstab" msgid "do not commit anything to disk" msgstr "non eseguire il commit di alcun elemento sul disco" -#, fuzzy msgid "do not show colors" -msgstr "non mostrare le partizioni sui DASD" +msgstr "non mostra i colori" msgid "do not show partitions on DASDs" msgstr "non mostrare le partizioni sui DASD" @@ -876,6 +878,10 @@ msgid "set RAID name" msgstr "imposta nome RAID" +#, fuzzy +msgid "set a key file" +msgstr "imposta nome dispositivo" + msgid "set chunk size" msgstr "imposta dimensioni blocco" @@ -935,7 +941,7 @@ msgstr "più multipath di mappatura per '%s' trovati" msgid "show colors" -msgstr "" +msgstr "colori visibili" msgid "show help and exit" msgstr "mostra guida ed esci" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.2/po/ja.po new/barrel-0.2.3/po/ja.po --- old/barrel-0.2.2/po/ja.po 2023-09-21 09:06:03.000000000 +0200 +++ new/barrel-0.2.3/po/ja.po 2023-10-10 06:56:35.000000000 +0200 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: barrel VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-21 08:53+0200\n" -"PO-Revision-Date: 2023-07-24 10:15+0000\n" +"POT-Creation-Date: 2023-10-06 12:47+0200\n" +"PO-Revision-Date: 2023-10-06 14:15+0000\n" "Last-Translator: Yasuhiko Kamata <belphe...@belbel.or.jp>\n" "Language-Team: Japanese <https://l10n.opensuse.org/projects/barrel/master/ja/" ">\n" @@ -473,8 +473,11 @@ msgid "device '%s' not found in mapping" msgstr "ããã¤ã¹ '%s' ããããã³ã°å ã«ããã¾ãã" +msgid "do not add in /etc/crypttab" +msgstr "/etc/crypttab å ã«è¿½å ãã¾ãã" + msgid "do not add in /etc/fstab" -msgstr "" +msgstr "/etc/fstab å ã«è¿½å ãã¾ãã" msgid "do not commit anything to disk" msgstr "ãã£ã¹ã¯ã«å¯¾ãã¦ã¯ä½ãé©ç¨ãã¾ãã" @@ -872,6 +875,9 @@ msgid "set RAID name" msgstr "RAID ã®ååãæå®ãã¾ã" +msgid "set a key file" +msgstr "éµãã¡ã¤ã«ãæå®ãã¾ã" + msgid "set chunk size" msgstr "ãã£ã³ã¯ãµã¤ãºãæå®ãã¾ã" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.2/po/mk.po new/barrel-0.2.3/po/mk.po --- old/barrel-0.2.2/po/mk.po 2023-09-21 09:06:03.000000000 +0200 +++ new/barrel-0.2.3/po/mk.po 2023-10-06 12:53:35.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-21 08:53+0200\n" +"POT-Creation-Date: 2023-10-06 12:47+0200\n" "PO-Revision-Date: 2023-03-21 04:14+0000\n" "Last-Translator: Kristijan Fremen Velkovski <m...@krisfremen.com>\n" "Language-Team: Macedonian <https://l10n.opensuse.org/projects/barrel/master/" @@ -473,6 +473,9 @@ msgid "device '%s' not found in mapping" msgstr "" +msgid "do not add in /etc/crypttab" +msgstr "" + msgid "do not add in /etc/fstab" msgstr "" @@ -856,6 +859,9 @@ msgid "set RAID name" msgstr "" +msgid "set a key file" +msgstr "" + msgid "set chunk size" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.2/po/pt_BR.po new/barrel-0.2.3/po/pt_BR.po --- old/barrel-0.2.2/po/pt_BR.po 2023-09-21 09:06:03.000000000 +0200 +++ new/barrel-0.2.3/po/pt_BR.po 2023-10-06 12:53:35.000000000 +0200 @@ -8,9 +8,9 @@ msgstr "" "Project-Id-Version: barrel VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-21 08:53+0200\n" -"PO-Revision-Date: 2023-02-08 14:14+0000\n" -"Last-Translator: Samanta Magalhaes <samanta_texttr...@outlook.com>\n" +"POT-Creation-Date: 2023-10-06 12:47+0200\n" +"PO-Revision-Date: 2023-10-04 23:15+0000\n" +"Last-Translator: Luiz Fernando Ranghetti <elcheviv...@gmail.com>\n" "Language-Team: Portuguese (Brazil) <https://l10n.opensuse.org/projects/" "barrel/master/pt_BR/>\n" "Language: pt_BR\n" @@ -320,16 +320,15 @@ msgid "Saves pools." msgstr "Salva os pools." -#, fuzzy msgid "Saves the devicegraph to a file." -msgstr "Salva o gráfico do dispositivo temporário em um arquivo." +msgstr "Salva o gráfico do dispositivo em um arquivo." msgid "Saving pools..." msgstr "Salvando pools..." #, c-format msgid "Setting id of partition %s from unsupported value to %s." -msgstr "" +msgstr "Configurando o ID da partição %s de um valor não suportado para %s." msgid "Shows DASDs." msgstr "Mostra DASDs." @@ -378,7 +377,7 @@ #. TRANSLATORS: transport layer/bus of a disk, e.g. SATA or USB msgid "Transport" -msgstr "" +msgstr "Transporte" msgid "Type" msgstr "Tipo" @@ -477,15 +476,18 @@ msgid "device '%s' not found in mapping" msgstr "dispositivo '%s' não encontrado no mapeamento" +#, fuzzy +msgid "do not add in /etc/crypttab" +msgstr "não adicionar no /etc/fstab" + msgid "do not add in /etc/fstab" -msgstr "" +msgstr "não adicionar no /etc/fstab" msgid "do not commit anything to disk" msgstr "não confirmar nada no disco" -#, fuzzy msgid "do not show colors" -msgstr "não mostrar partições em DASDs" +msgstr "não mostrar cores" msgid "do not show partitions on DASDs" msgstr "não mostrar partições em DASDs" @@ -870,6 +872,10 @@ msgid "set RAID name" msgstr "definir nome do RAID" +#, fuzzy +msgid "set a key file" +msgstr "definir nome do dispositivo" + msgid "set chunk size" msgstr "definir tamanho do pacote" @@ -929,7 +935,7 @@ msgstr "múltiplos caminhos de mapeamento para '%s' encontrados" msgid "show colors" -msgstr "" +msgstr "mostrar cores" msgid "show help and exit" msgstr "mostrar ajuda e sair" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.2/po/zh_CN.po new/barrel-0.2.3/po/zh_CN.po --- old/barrel-0.2.2/po/zh_CN.po 2023-09-21 09:06:03.000000000 +0200 +++ new/barrel-0.2.3/po/zh_CN.po 2023-10-06 12:53:35.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: barrel VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-21 08:53+0200\n" +"POT-Creation-Date: 2023-10-06 12:47+0200\n" "PO-Revision-Date: 2023-02-08 05:14+0000\n" "Last-Translator: Grace Yu <grace...@excel-gits.com>\n" "Language-Team: Chinese (China) <https://l10n.opensuse.org/projects/barrel/" @@ -474,6 +474,9 @@ msgid "device '%s' not found in mapping" msgstr "卿 å°ä¸æªæ¾å°è®¾å¤ \"%s\"" +msgid "do not add in /etc/crypttab" +msgstr "" + msgid "do not add in /etc/fstab" msgstr "" @@ -858,6 +861,10 @@ msgid "set RAID name" msgstr "设置 RAID åç§°" +#, fuzzy +msgid "set a key file" +msgstr "设置设å¤åç§°" + msgid "set chunk size" msgstr "设置åºå大å°" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.2/po/zh_TW.po new/barrel-0.2.3/po/zh_TW.po --- old/barrel-0.2.2/po/zh_TW.po 2023-09-21 09:06:03.000000000 +0200 +++ new/barrel-0.2.3/po/zh_TW.po 2023-10-06 12:53:35.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: barrel VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-09-21 08:53+0200\n" +"POT-Creation-Date: 2023-10-06 12:47+0200\n" "PO-Revision-Date: 2023-02-08 09:14+0000\n" "Last-Translator: Grace Yu <grace...@excel-gits.com>\n" "Language-Team: Chinese (Taiwan) <https://l10n.opensuse.org/projects/barrel/" @@ -474,6 +474,9 @@ msgid "device '%s' not found in mapping" msgstr "å¨å°æä¸æ¾ä¸å°è£ç½® \"%s\"" +msgid "do not add in /etc/crypttab" +msgstr "" + msgid "do not add in /etc/fstab" msgstr "" @@ -858,6 +861,10 @@ msgid "set RAID name" msgstr "è¨å® RAID å稱" +#, fuzzy +msgid "set a key file" +msgstr "è¨å®è£ç½®å稱" + msgid "set chunk size" msgstr "è¨å®åå¡å¤§å°" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/barrel-0.2.2/testsuite/luks1.cc new/barrel-0.2.3/testsuite/luks1.cc --- old/barrel-0.2.2/testsuite/luks1.cc 2022-07-07 09:04:40.000000000 +0200 +++ new/barrel-0.2.3/testsuite/luks1.cc 2023-10-06 12:45:59.000000000 +0200 @@ -69,6 +69,7 @@ const Partition* sdb1 = Partition::find_by_name(staging, "/dev/sdb1"); const Encryption* encryption = sdb1->get_encryption(); BOOST_CHECK_EQUAL(encryption->get_type(), EncryptionType::LUKS1); + BOOST_CHECK_EQUAL(encryption->get_password(), "mockup"); } @@ -97,6 +98,7 @@ const Disk* sdb = Disk::find_by_name(staging, "/dev/sdb"); const Encryption* encryption = sdb->get_encryption(); BOOST_CHECK_EQUAL(encryption->get_type(), EncryptionType::LUKS2); + BOOST_CHECK_EQUAL(encryption->get_password(), "mockup"); } @@ -120,3 +122,34 @@ BOOST_CHECK_EQUAL(actions, testsuite.actions); } + + +BOOST_AUTO_TEST_CASE(test4) +{ + // Since we use a key file we do not get a prompt for a password. So the password is + // "" instead of "mockup". + + Args args({ "--dry-run", "--yes", "create", "luks2", "--name=cr-test", "/dev/sdb", "--size", "max", + "--key-file", "/secret.key", "ext4" }); + + vector<string> actions = { + "Create partition /dev/sdb1 (32.00 GiB)", + "Create encryption layer device on /dev/sdb1", + "Activate encryption layer device on /dev/sdb1", + "Create ext4 on /dev/mapper/cr-test (31.98 GiB)", + "Add encryption layer device on /dev/sdb1 to /etc/crypttab" + }; + + Testsuite testsuite; + testsuite.devicegraph_filename = "empty2.xml"; + + handle(args.argc(), args.argv(), &testsuite); + + BOOST_CHECK_EQUAL(actions, testsuite.actions); + + const Devicegraph* staging = testsuite.storage->get_staging(); + + const Partition* sdb1 = Partition::find_by_name(staging, "/dev/sdb1"); + const Encryption* encryption = sdb1->get_encryption(); + BOOST_CHECK_EQUAL(encryption->get_password(), ""); +}