Skip to content

Commit

Permalink
Resolved conflict in spec file
Browse files Browse the repository at this point in the history
  • Loading branch information
olf (Olf0) authored and olf (Olf0) committed Mar 20, 2023
2 parents c84adbb + 72175ec commit d703da6
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion rpm/crypto-sdcard.spec
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ Provides: crypto-sdcard_sbj
%description
%{summary}, as SD-cards, USB-attached storage etc.

"Key"-file naming scheme: /etc/%{name}/crypto_luks_<UUID>.key rsp. /etc/%{name}/crypto_plain_<device-name>.key
"Key"-file naming scheme: /etc/%{name}/crypto_luks_<UUID>.key
respectively for "plain" /etc/%{name}/crypto_plain_<device-name>.key

%if 0%{?_chum}
PackageName: %{name}
Expand Down

0 comments on commit d703da6

Please sign in to comment.