Bug#775772: unblock live-boot/4.0.2-1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock live-boot/4.0.2-1.
Changes since 4.0.1-1 (jessie) are:
* Dropping usage of /etc/fstab.d since util-linux removed it
* Fix spelling of unknown
* Suppress annoying but harmless warning about unknown module
--
Address: Daniel Baumann, Donnerbuehlweg 3, CH-3012 Bern
Email: daniel.baumann@progress-technologies.net
Internet: http://people.progress-technologies.net/~daniel.baumann/
diff -Naurp live-boot.orig/VERSION live-boot/VERSION
--- live-boot.orig/VERSION 2014-10-25 14:26:50.000000000 +0200
+++ live-boot/VERSION 2014-12-10 10:36:26.000000000 +0100
@@ -1 +1 @@
-4.0.1-1
+4.0.2-1
diff -Naurp live-boot.orig/components/3020-swap live-boot/components/3020-swap
--- live-boot.orig/components/3020-swap 2014-10-25 14:20:59.000000000 +0200
+++ live-boot/components/3020-swap 2014-12-10 10:36:26.000000000 +0100
@@ -48,15 +48,15 @@ Swap ()
done
# Remove all auto swap entries
- if grep -qs "swap swap" /root/etc/fstab.d/swap
+ if grep -qs "swap swap" /root/etc/fstab
then
- grep -v "swap swap" /root/etc/fstab.d/swap > /root/etc/fstab.d/swap.tmp
- mv /root/etc/fstab.d/swap.tmp /root/etc/fstab.d/swap
+ grep -v "swap swap" /root/etc/fstab > /root/etc/fstab.tmp
+ mv /root/etc/fstab.tmp /root/etc/fstab
fi
# Add new swap entries
for _DEVICE in ${_SWAP_DEVICES}
do
- echo "${_DEVICE} swap swap defaults 0 0" >> /root/etc/fstab.d/swap
+ echo "${_DEVICE} swap swap defaults 0 0" >> /root/etc/fstab
done
}
diff -Naurp live-boot.orig/components/9990-fstab.sh live-boot/components/9990-fstab.sh
--- live-boot.orig/components/9990-fstab.sh 2014-10-25 14:20:59.000000000 +0200
+++ live-boot/components/9990-fstab.sh 2014-12-10 10:36:26.000000000 +0100
@@ -15,14 +15,14 @@ Fstab ()
log_begin_msg "Configuring fstab"
- if ! grep -qs "^${UNIONTYPE}" /root/etc/fstab.d/live
+ if ! grep -qs "^${UNIONTYPE}" /root/etc/fstab
then
- echo "${UNIONTYPE} / ${UNIONTYPE} rw 0 0" >> /root/etc/fstab.d/live
+ echo "${UNIONTYPE} / ${UNIONTYPE} rw 0 0" >> /root/etc/fstab
fi
- if ! grep -qs "^tmpfs /tmp" /root/etc/fstab.d/live
+ if ! grep -qs "^tmpfs /tmp" /root/etc/fstab
then
- echo "tmpfs /tmp tmpfs nosuid,nodev 0 0" >> /root/etc/fstab.d/live
+ echo "tmpfs /tmp tmpfs nosuid,nodev 0 0" >> /root/etc/fstab
fi
log_end_msg
diff -Naurp live-boot.orig/components/9990-misc-helpers.sh live-boot/components/9990-misc-helpers.sh
--- live-boot.orig/components/9990-misc-helpers.sh 2014-10-25 14:26:50.000000000 +0200
+++ live-boot/components/9990-misc-helpers.sh 2014-12-10 10:36:26.000000000 +0100
@@ -426,7 +426,7 @@ is_supported_fs ()
return 0
else
# Then try to add support for it the gentle way using the initramfs capabilities
- modprobe ${fstype}
+ modprobe -q -b ${fstype}
if grep -q ${fstype} /proc/filesystems
then
return 0
@@ -1415,7 +1415,7 @@ get_custom_mounts ()
union|bind)
;;
*)
- log_warning_msg "Skipping custom mount with unkown option: ${opt}"
+ log_warning_msg "Skipping custom mount with unknown option: ${opt}"
continue 2
;;
esac
diff -Naurp live-boot.orig/debian/changelog live-boot/debian/changelog
--- live-boot.orig/debian/changelog 2014-10-25 14:27:37.000000000 +0200
+++ live-boot/debian/changelog 2014-12-10 10:36:26.000000000 +0100
@@ -1,3 +1,15 @@
+live-boot (4.0.2-1) unstable; urgency=low
+
+ [ Daniel Baumann ]
+ * Dropping usage of /etc/fstab.d since util-linux removed it, thanks to
+ Evgeni Golov <evgeni+git@golov.de> for reporting it.
+
+ [ Jan Blunck ]
+ * Fix spelling of unknown
+ * Suppress annoying but harmless warning about unknown module
+
+ -- Daniel Baumann <mail@daniel-baumann.ch> Wed, 10 Dec 2014 10:36:04 +0100
+
live-boot (4.0.1-1) unstable; urgency=low
[ victory ]
diff -Naurp live-boot.orig/manpages/en/live-boot.7 live-boot/manpages/en/live-boot.7
--- live-boot.orig/manpages/en/live-boot.7 2014-10-25 14:26:50.000000000 +0200
+++ live-boot/manpages/en/live-boot.7 2014-12-10 10:36:26.000000000 +0100
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2014\-10\-25 4.0.1-1 "Live Systems Project"
+.TH LIVE\-BOOT 7 2014\-12\-10 4.0.2-1 "Live Systems Project"
.SH NAME
\fBlive\-boot\fR \- System Boot Components
diff -Naurp live-boot.orig/manpages/en/persistence.conf.5 live-boot/manpages/en/persistence.conf.5
--- live-boot.orig/manpages/en/persistence.conf.5 2014-10-25 14:26:50.000000000 +0200
+++ live-boot/manpages/en/persistence.conf.5 2014-12-10 10:36:26.000000000 +0100
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT conf 2014\-10\-25 4.0.1-1 "Live Systems Project"
+.TH LIVE\-BOOT conf 2014\-12\-10 4.0.2-1 "Live Systems Project"
.SH NAME
\fBpersistence.conf\fR \- Configuration file for persistence media in
diff -Naurp live-boot.orig/manpages/es/live-boot.es.7 live-boot/manpages/es/live-boot.es.7
--- live-boot.orig/manpages/es/live-boot.es.7 2014-10-25 14:26:50.000000000 +0200
+++ live-boot/manpages/es/live-boot.es.7 2014-12-10 10:36:26.000000000 +0100
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT 7 2014\-10\-25 4.0.1\-1 "Proyecto Live Systems"
+.TH LIVE\-BOOT 7 2014\-12\-10 4.0.2\-1 "Proyecto Live Systems"
.SH NOMBRE
\fBlive\-boot\fP \- Componentes de Arranque del Sistema
diff -Naurp live-boot.orig/manpages/es/persistence.conf.es.5 live-boot/manpages/es/persistence.conf.es.5
--- live-boot.orig/manpages/es/persistence.conf.es.5 2014-10-25 14:26:50.000000000 +0200
+++ live-boot/manpages/es/persistence.conf.es.5 2014-12-10 10:36:26.000000000 +0100
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT conf 2014\-10\-25 4.0.1\-1 "Proyecto Live Systems"
+.TH LIVE\-BOOT conf 2014\-12\-10 4.0.2\-1 "Proyecto Live Systems"
.SH NOMBRE
\fBpersistence.conf\fP \- Fichero para configurar medios de almacenamiento con
diff -Naurp live-boot.orig/manpages/ja/live-boot.ja.7 live-boot/manpages/ja/live-boot.ja.7
--- live-boot.orig/manpages/ja/live-boot.ja.7 2014-10-25 14:26:50.000000000 +0200
+++ live-boot/manpages/ja/live-boot.ja.7 2014-12-10 10:36:26.000000000 +0100
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT 7 2014\-10\-25 4.0.1\-1 "Live ã?·ã?¹ã??ã? ã??ã?ã?¸ã?§ã?¯ã??"
+.TH LIVE\-BOOT 7 2014\-12\-10 4.0.2\-1 "Live ã?·ã?¹ã??ã? ã??ã?ã?¸ã?§ã?¯ã??"
.SH å??å??
\fBlive\-boot\fP \- ã?·ã?¹ã??ã? èµ·å??æ§?æ??è¦?ç´
diff -Naurp live-boot.orig/manpages/ja/persistence.conf.ja.5 live-boot/manpages/ja/persistence.conf.ja.5
--- live-boot.orig/manpages/ja/persistence.conf.ja.5 2014-10-25 14:26:50.000000000 +0200
+++ live-boot/manpages/ja/persistence.conf.ja.5 2014-12-10 10:36:26.000000000 +0100
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT conf 2014\-10\-25 4.0.1\-1 "Live ã?·ã?¹ã??ã? ã??ã?ã?¸ã?§ã?¯ã??"
+.TH LIVE\-BOOT conf 2014\-12\-10 4.0.2\-1 "Live ã?·ã?¹ã??ã? ã??ã?ã?¸ã?§ã?¯ã??"
.SH å??å??
\fBpersistence.conf\fP \- live\-boot ç?¶æ??ä¿?æ??ç?¨ã?¡ã??ã?£ã?¢ã?®è¨å®?ã??ã?¡ã?¤ã?«
diff -Naurp live-boot.orig/manpages/po/es/live-boot.7.po live-boot/manpages/po/es/live-boot.7.po
--- live-boot.orig/manpages/po/es/live-boot.7.po 2014-10-25 14:26:50.000000000 +0200
+++ live-boot/manpages/po/es/live-boot.7.po 2014-12-10 10:36:26.000000000 +0100
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-boot\n"
-"POT-Creation-Date: 2014-10-25 14:25+0200\n"
+"POT-Creation-Date: 2014-12-10 10:35+0100\n"
"PO-Revision-Date: 2013-11-10 20:10+0900\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
"Language-Team: none\n"
@@ -25,13 +25,13 @@ msgstr "LIVE-BOOT"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "2014-10-25"
+msgid "2014-12-10"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "4.0.1-1"
+msgid "4.0.2-1"
msgstr ""
#. type: TH
diff -Naurp live-boot.orig/manpages/po/es/persistence.conf.5.po live-boot/manpages/po/es/persistence.conf.5.po
--- live-boot.orig/manpages/po/es/persistence.conf.5.po 2014-10-25 14:26:50.000000000 +0200
+++ live-boot/manpages/po/es/persistence.conf.5.po 2014-12-10 10:36:26.000000000 +0100
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-boot\n"
-"POT-Creation-Date: 2014-10-25 14:25+0200\n"
+"POT-Creation-Date: 2014-12-10 10:35+0100\n"
"PO-Revision-Date: 2013-11-10 20:10+0900\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
"Language-Team: none\n"
@@ -23,13 +23,13 @@ msgstr "LIVE-BOOT"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "2014-10-25"
+msgid "2014-12-10"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "4.0.1-1"
+msgid "4.0.2-1"
msgstr ""
#. type: TH
diff -Naurp live-boot.orig/manpages/po/ja/live-boot.7.po live-boot/manpages/po/ja/live-boot.7.po
--- live-boot.orig/manpages/po/ja/live-boot.7.po 2014-10-25 14:26:50.000000000 +0200
+++ live-boot/manpages/po/ja/live-boot.7.po 2014-12-10 10:36:26.000000000 +0100
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-boot\n"
-"POT-Creation-Date: 2014-10-25 14:25+0200\n"
+"POT-Creation-Date: 2014-12-10 10:35+0100\n"
"PO-Revision-Date: 2014-08-28 02:52+0900\n"
"Last-Translator: victory <victory.deb@gmail.com>\n"
"Language-Team: none\n"
@@ -23,13 +23,13 @@ msgstr "LIVE-BOOT"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "2014-10-25"
+msgid "2014-12-10"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "4.0.1-1"
+msgid "4.0.2-1"
msgstr ""
#. type: TH
diff -Naurp live-boot.orig/manpages/po/ja/persistence.conf.5.po live-boot/manpages/po/ja/persistence.conf.5.po
--- live-boot.orig/manpages/po/ja/persistence.conf.5.po 2014-10-25 14:26:50.000000000 +0200
+++ live-boot/manpages/po/ja/persistence.conf.5.po 2014-12-10 10:36:26.000000000 +0100
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-boot\n"
-"POT-Creation-Date: 2014-10-25 14:25+0200\n"
+"POT-Creation-Date: 2014-12-10 10:35+0100\n"
"PO-Revision-Date: 2014-08-28 02:52+0900\n"
"Last-Translator: victory <victory.deb@gmail.com>\n"
"Language-Team: none\n"
@@ -23,13 +23,13 @@ msgstr "LIVE-BOOT"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "2014-10-25"
+msgid "2014-12-10"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "4.0.1-1"
+msgid "4.0.2-1"
msgstr ""
#. type: TH
diff -Naurp live-boot.orig/manpages/pot/live-boot.7.pot live-boot/manpages/pot/live-boot.7.pot
--- live-boot.orig/manpages/pot/live-boot.7.pot 2014-10-25 14:26:50.000000000 +0200
+++ live-boot/manpages/pot/live-boot.7.pot 2014-12-10 10:36:26.000000000 +0100
@@ -6,8 +6,8 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: live-boot 4.0.1-1\n"
-"POT-Creation-Date: 2014-10-25 14:25+0200\n"
+"Project-Id-Version: live-boot 4.0.2-1\n"
+"POT-Creation-Date: 2014-12-10 10:35+0100\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,13 +25,13 @@ msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "2014-10-25"
+msgid "2014-12-10"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "4.0.1-1"
+msgid "4.0.2-1"
msgstr ""
#. type: TH
diff -Naurp live-boot.orig/manpages/pot/persistence.conf.5.pot live-boot/manpages/pot/persistence.conf.5.pot
--- live-boot.orig/manpages/pot/persistence.conf.5.pot 2014-10-25 14:26:50.000000000 +0200
+++ live-boot/manpages/pot/persistence.conf.5.pot 2014-12-10 10:36:26.000000000 +0100
@@ -6,8 +6,8 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: live-boot 4.0.1-1\n"
-"POT-Creation-Date: 2014-10-25 14:25+0200\n"
+"Project-Id-Version: live-boot 4.0.2-1\n"
+"POT-Creation-Date: 2014-12-10 10:35+0100\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,13 +25,13 @@ msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "2014-10-25"
+msgid "2014-12-10"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "4.0.1-1"
+msgid "4.0.2-1"
msgstr ""
#. type: TH
Reply to: