Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
18 files changed:
+ # check for plymouth
+ if [ -x /bin/plymouth ]
+ then
+ _PLYMOUTH="true"
+ fi
+
+ case "${_PLYMOUTH}" in
+ true)
+ plymouth --ping
+
+ cryptkeyscript="plymouth ask-for-password --prompt"
+ # Plymouth will add a : if it is a non-graphical prompt
+ cryptkeyprompt="Please unlock disk ${dev}"
+ ;;
+
+ *)
+ cryptkeyscript="/lib/cryptsetup/askpass"
+ cryptkeyprompt="Please unlock disk ${dev}: "
+ ;;
+ esac
+
- /lib/cryptsetup/askpass "Enter passphrase for ${dev}: " | \
+ $cryptkeyscript "$cryptkeyprompt" | \
/sbin/cryptsetup -T 1 luksOpen ${dev} ${name} ${opts}
if [ 0 -eq ${?} ]
/sbin/cryptsetup -T 1 luksOpen ${dev} ${name} ${opts}
if [ 0 -eq ${?} ]
- echo -n "There was an error decrypting ${dev} ... Retry? [Y/n] " >&6
- read answer
+ retryprompt="There was an error decrypting ${dev} ... Retry? [Y/n]"
+
+ case "${_PLYMOUTH}" in
+ true)
+ plymouth display-message --text "${retryprompt}"
+ answer=$(plymouth watch-keystroke --keys="YNyn")
+ ;;
+
+ *)
+ echo -n "${retryprompt} " >&6
+ read answer
+ ;;
+ esac
if [ "$(echo "${answer}" | cut -b1 | tr A-Z a-z)" = "n" ]
then
if [ "$(echo "${answer}" | cut -b1 | tr A-Z a-z)" = "n" ]
then
+ case "${_PLYMOUTH}" in
+ true)
+ plymouth display-message --text ""
+ ;;
+ esac
+
update:
./bin/update-version.sh
update:
./bin/update-version.sh
@if [ ! -x "$$(which po4a 2>/dev/null)" ]; \
then \
echo "E: po4a - command not found"; \
@if [ ! -x "$$(which po4a 2>/dev/null)" ]; \
then \
echo "E: po4a - command not found"; \
- po4a --keep 0 --no-backups --package-name live-boot po4a.cfg
+ po4a --keep 0 --package-name live-boot --package-version $(shell cat ../VERSION) po4a.cfg
clean:
rm -rf $(LANGUAGES)
clean:
rm -rf $(LANGUAGES)
rm -f po4a.cfg
rebuild: distclean update build
rm -f po4a.cfg
rebuild: distclean update build
+
+check:
+ @echo -n "Checking the integrity of .po files "
+
+ @if [ -x /usr/bin/msgfmt ]; \
+ then \
+ for POFILE in po/*/*; \
+ do \
+ msgfmt --check --output-file=/dev/null $${POFILE}; \
+ echo -n "."; \
+ done; \
+ else \
+ echo "WARNING: skipping po integrity check. You must install gettext."; \
+ fi
+
+ @echo " done!"
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT 7 2014\-03\-31 4.0~alpha21\-1 "Live Systems Project"
+.TH LIVE\-BOOT 7 2014\-08\-27 4.0~alpha21\-1 "Live Systems Project"
.SH NAME
\fBlive\-boot\fP \- System Boot Components
.SH NAME
\fBlive\-boot\fP \- System Boot Components
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT conf 2014\-03\-31 4.0~alpha21\-1 "Live Systems Project"
+.TH LIVE\-BOOT conf 2014\-08\-27 4.0~alpha21\-1 "Live Systems Project"
.SH NAME
\fBpersistence.conf\fP \- Configuration file for persistence media in live\-boot
.SH NAME
\fBpersistence.conf\fP \- Configuration file for persistence media in live\-boot
-.TH LIVE\-BOOT 7 2014\-03\-31 4.0~alpha21-1 "Live Systems Project"
+.TH LIVE\-BOOT 7 2014\-08\-27 4.0~alpha21-1 "Live Systems Project"
.SH NAME
\fBlive\-boot\fR \- System Boot Components
.SH NAME
\fBlive\-boot\fR \- System Boot Components
-.TH LIVE\-BOOT conf 2014\-03\-31 4.0~alpha21-1 "Live Systems Project"
+.TH LIVE\-BOOT conf 2014\-08\-27 4.0~alpha21-1 "Live Systems Project"
.SH NAME
\fBpersistence.conf\fR \- Configuration file for persistence media in
.SH NAME
\fBpersistence.conf\fR \- Configuration file for persistence media in
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT 7 2014\-03\-31 4.0~alpha21\-1 "Proyecto Live Systems"
+.TH LIVE\-BOOT 7 2014\-08\-27 4.0~alpha21\-1 "Proyecto Live Systems"
.SH NOMBRE
\fBlive\-boot\fP \- Componentes de Arranque del Sistema
.SH NOMBRE
\fBlive\-boot\fP \- Componentes de Arranque del Sistema
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT conf 2014\-03\-31 4.0~alpha21\-1 "Proyecto Live Systems"
+.TH LIVE\-BOOT conf 2014\-08\-27 4.0~alpha21\-1 "Proyecto Live Systems"
.SH NOMBRE
\fBpersistence.conf\fP \- Fichero para configurar medios de almacenamiento con
.SH NOMBRE
\fBpersistence.conf\fP \- Fichero para configurar medios de almacenamiento con
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT 7 2014\-03\-31 4.0~alpha21\-1 "Live システムプロジェクト"
+.TH LIVE\-BOOT 7 2014\-08\-27 4.0~alpha21\-1 "Live システムプロジェクト"
.SH 名前
\fBlive\-boot\fP \- システム起動構成要素
.SH 名前
\fBlive\-boot\fP \- システム起動構成要素
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT conf 2014\-03\-31 4.0~alpha21\-1 "Live システムプロジェクト"
+.TH LIVE\-BOOT conf 2014\-08\-27 4.0~alpha21\-1 "Live システムプロジェクト"
.SH 名前
\fBpersistence.conf\fP \- live\-boot 状態保持用メディアの設定ファイル
.SH 名前
\fBpersistence.conf\fP \- live\-boot 状態保持用メディアの設定ファイル
-"Project-Id-Version: live-boot 4.0~alpha21-1\n"
-"POT-Creation-Date: 2014-03-31 21:55+0200\n"
+"Project-Id-Version: live-boot 4.0.0-1\n"
+"POT-Creation-Date: 2014-08-27 19:52+0200\n"
"PO-Revision-Date: 2013-11-10 20:10+0900\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
"Language-Team: none\n"
"PO-Revision-Date: 2013-11-10 20:10+0900\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
"Language-Team: none\n"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgid "4.0~alpha21-1"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgid "4.0~alpha21-1"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
-"Project-Id-Version: live-boot 4.0~alpha21-1\n"
-"POT-Creation-Date: 2014-03-31 21:55+0200\n"
+"Project-Id-Version: live-boot 4.0.0-1\n"
+"POT-Creation-Date: 2014-08-27 19:52+0200\n"
"PO-Revision-Date: 2013-11-10 20:10+0900\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
"Language-Team: none\n"
"PO-Revision-Date: 2013-11-10 20:10+0900\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
"Language-Team: none\n"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgid "4.0~alpha21-1"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgid "4.0~alpha21-1"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
-"Project-Id-Version: live-boot 4.0~alpha21-1\n"
-"POT-Creation-Date: 2014-03-31 21:55+0200\n"
+"Project-Id-Version: live-boot 4.0.0-1\n"
+"POT-Creation-Date: 2014-08-27 19:52+0200\n"
"PO-Revision-Date: 2013-11-10 20:10+0900\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
"Language-Team: none\n"
"PO-Revision-Date: 2013-11-10 20:10+0900\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
"Language-Team: none\n"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgid "4.0~alpha21-1"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgid "4.0~alpha21-1"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
-"Project-Id-Version: live-boot 4.0~alpha21-1\n"
-"POT-Creation-Date: 2014-03-31 21:55+0200\n"
+"Project-Id-Version: live-boot 4.0.0-1\n"
+"POT-Creation-Date: 2014-08-27 19:52+0200\n"
"PO-Revision-Date: 2013-11-10 20:10+0900\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
"Language-Team: none\n"
"PO-Revision-Date: 2013-11-10 20:10+0900\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
"Language-Team: none\n"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgid "4.0~alpha21-1"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgid "4.0~alpha21-1"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
-"Project-Id-Version: live-boot 4.0~alpha21-1\n"
-"POT-Creation-Date: 2014-03-31 21:55+0200\n"
+"Project-Id-Version: live-boot 4.0.0-1\n"
+"POT-Creation-Date: 2014-08-27 19:52+0200\n"
"PO-Revision-Date: 2013-11-10 20:10+0900\n"
"Last-Translator: victory <victory.deb@gmail.com>\n"
"Language-Team: none\n"
"PO-Revision-Date: 2013-11-10 20:10+0900\n"
"Last-Translator: victory <victory.deb@gmail.com>\n"
"Language-Team: none\n"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgid "4.0~alpha21-1"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgid "4.0~alpha21-1"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
-"Project-Id-Version: live-boot 4.0~alpha21-1\n"
-"POT-Creation-Date: 2014-03-31 21:55+0200\n"
+"Project-Id-Version: live-boot 4.0.0-1\n"
+"POT-Creation-Date: 2014-08-27 19:52+0200\n"
"PO-Revision-Date: 2013-11-06 04:30+0900\n"
"Last-Translator: victory <victory.deb@gmail.com>\n"
"Language-Team: none\n"
"PO-Revision-Date: 2013-11-06 04:30+0900\n"
"Last-Translator: victory <victory.deb@gmail.com>\n"
"Language-Team: none\n"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgid "4.0~alpha21-1"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
msgid "4.0~alpha21-1"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, fuzzy
msgid ""
msgstr ""
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2014-03-31 21:55+0200\n"
+"Project-Id-Version: live-boot 4.0~alpha21-1\n"
+"POT-Creation-Date: 2014-08-27 19:52+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
#, fuzzy
msgid ""
msgstr ""
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2014-03-31 21:55+0200\n"
+"Project-Id-Version: live-boot 4.0~alpha21-1\n"
+"POT-Creation-Date: 2014-08-27 19:52+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap