From 877198359c7f383e94b51c6d197feb4677088d0eb43a0033c457a5df87a68bf7 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 11 Jun 2007 10:57:44 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cryptsetup?expand=0&rev=2 --- boot.crypto | 10 +++++----- cryptsetup.changes | 5 +++++ cryptsetup.spec | 4 +++- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/boot.crypto b/boot.crypto index 0431143..1a1ca92 100644 --- a/boot.crypto +++ b/boot.crypto @@ -166,12 +166,12 @@ paranoid_safety_checks() if test -n "$quiet"; then return 2 fi - echo "${warn}An error occured. Maybe the wrong passphrase was" - echo "entered or the file system on $physdev is corrupted.${norm}" + echo "${warn}An error occurred. The passphrase may be wrong or the" + echo "file system on $physdev might be corrupted.${norm}" + while true ; do - # TODO: rephrase that - echo "${extd}Do you want to retry entering the passphrase?${norm}" - echo -n "${extd}Alternatively you may continue with a file system check.${norm}" + echo "${extd}To check the file system, enter Check.${norm}" + echo -n "${extd}Retry entering the passphrase?${norm}" choice= read -p " ([${extd}yes${norm}]/${extd}no${norm}/${extd}check${norm}/) " choice < $REDIRECT || { echo 'no'; choice='no'; } case "$choice" in diff --git a/cryptsetup.changes b/cryptsetup.changes index b4e1916..4303ddb 100644 --- a/cryptsetup.changes +++ b/cryptsetup.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 11 09:23:24 CEST 2007 - lnussel@suse.de + +- rephrase error message (#279169) + ------------------------------------------------------------------- Fri Jun 1 10:07:14 CEST 2007 - lnussel@suse.de diff --git a/cryptsetup.spec b/cryptsetup.spec index d2b7a2a..ad6a61b 100644 --- a/cryptsetup.spec +++ b/cryptsetup.spec @@ -19,7 +19,7 @@ License: BSD License and BSD-like, GNU General Public License (GPL) Group: System/Base Autoreqprov: on Version: 1.0.5 -Release: 1 +Release: 6 Summary: Set up dm-crypt based encrypted block devices Source: cryptsetup-1.0.5.tar.bz2 Source1: hashalot-%haver.tar.bz2 @@ -183,6 +183,8 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libcryptsetup.so %changelog +* Mon Jun 11 2007 - lnussel@suse.de +- rephrase error message (#279169) * Fri Jun 01 2007 - lnussel@suse.de - rename util-linux-crypto to cryptsetup - remove dmconvert