Adding upstream version 4.0.0.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
grml · Aug 27, 2014 · 2054612 · 2054612
1 parent f27fd02
commit 2054612
Show file tree

Hide file tree

Showing 18 changed files with 97 additions and 43 deletions.
diff --git a/components/9990-misc-helpers.sh b/components/9990-misc-helpers.sh
@@ -803,9 +803,30 @@ open_luks_device ()
 
 	load_keymap
 
+	# 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
+
 	while true
 	do
-		/lib/cryptsetup/askpass "Enter passphrase for ${dev}: " | \
+		$cryptkeyscript "$cryptkeyprompt" | \
 			/sbin/cryptsetup -T 1 luksOpen ${dev} ${name} ${opts}
 
 		if [ 0 -eq ${?} ]
@@ -816,11 +837,28 @@ open_luks_device ()
 		fi
 
 		echo >&6
-		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
+			case "${_PLYMOUTH}" in
+				true)
+					plymouth display-message --text ""
+					;;
+			esac
+
 			return 2
 		fi
 	done

diff --git a/manpages/Makefile b/manpages/Makefile
@@ -19,7 +19,7 @@ po4a.cfg:
 update:
 	./bin/update-version.sh
 
-build: po4a.cfg
+build: check po4a.cfg
 	@if [ ! -x "$$(which po4a 2>/dev/null)" ]; \
 	then \
 		echo "E: po4a - command not found"; \
@@ -30,7 +30,7 @@ build: po4a.cfg
 		exit 1; \
 	fi
 
-	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)
@@ -39,3 +39,19 @@ distclean: clean
 	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!"
diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
@@ -3,7 +3,7 @@
 .\" 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

diff --git a/manpages/de/persistence.conf.de.5 b/manpages/de/persistence.conf.de.5
@@ -3,7 +3,7 @@
 .\" 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

diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.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

diff --git a/manpages/en/persistence.conf.5 b/manpages/en/persistence.conf.5
@@ -1,4 +1,4 @@
-.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

diff --git a/manpages/es/live-boot.es.7 b/manpages/es/live-boot.es.7
@@ -3,7 +3,7 @@
 .\" 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

diff --git a/manpages/es/persistence.conf.es.5 b/manpages/es/persistence.conf.es.5
@@ -3,7 +3,7 @@
 .\" 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

diff --git a/manpages/ja/live-boot.ja.7 b/manpages/ja/live-boot.ja.7
@@ -3,7 +3,7 @@
 .\" 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 \- システム起動構成要素

diff --git a/manpages/ja/persistence.conf.ja.5 b/manpages/ja/persistence.conf.ja.5
@@ -3,7 +3,7 @@
 .\" 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 状態保持用メディアの設定ファイル

diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"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"
@@ -24,14 +24,14 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2014-03-31"
+msgid "2014-08-27"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
 msgid "4.0~alpha21-1"
-msgstr "4.0~alpha21-1"
+msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1

diff --git a/manpages/po/de/persistence.conf.5.po b/manpages/po/de/persistence.conf.5.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"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"
@@ -24,14 +24,14 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2014-03-31"
+msgid "2014-08-27"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
 msgid "4.0~alpha21-1"
-msgstr "4.0~alpha21-1"
+msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1

diff --git a/manpages/po/es/live-boot.7.po b/manpages/po/es/live-boot.7.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"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"
@@ -25,14 +25,14 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2014-03-31"
+msgid "2014-08-27"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
 msgid "4.0~alpha21-1"
-msgstr "4.0~alpha21-1"
+msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1

diff --git a/manpages/po/es/persistence.conf.5.po b/manpages/po/es/persistence.conf.5.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"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"
@@ -23,14 +23,14 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2014-03-31"
+msgid "2014-08-27"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
 msgid "4.0~alpha21-1"
-msgstr "4.0~alpha21-1"
+msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1

diff --git a/manpages/po/ja/live-boot.7.po b/manpages/po/ja/live-boot.7.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"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"
@@ -23,14 +23,14 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2014-03-31"
+msgid "2014-08-27"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
 msgid "4.0~alpha21-1"
-msgstr "4.0~alpha21-1"
+msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1

diff --git a/manpages/po/ja/persistence.conf.5.po b/manpages/po/ja/persistence.conf.5.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"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"
@@ -23,14 +23,14 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2014-03-31"
+msgid "2014-08-27"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
 msgid "4.0~alpha21-1"
-msgstr "4.0~alpha21-1"
+msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1

diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot
@@ -6,8 +6,8 @@
 #, 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"
@@ -25,7 +25,7 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2014-03-31"
+msgid "2014-08-27"
 msgstr ""
 
 #. type: TH

diff --git a/manpages/pot/persistence.conf.5.pot b/manpages/pot/persistence.conf.5.pot
@@ -6,8 +6,8 @@
 #, 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"
@@ -25,7 +25,7 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "2014-03-31"
+msgid "2014-08-27"
 msgstr ""
 
 #. type: TH