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
}
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
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
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
+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+grml.3) unstable; urgency=medium
[ Evgeni Golov ]
reverts/drop_nameserver_from_ip_option.patch
reverts/restore_support_for_old_persistence.patch
41_vlan_support.patch
-stop-using-etc-fstab.d.patch
+++ /dev/null
-From f587cb900b3100f31d379f3f9e1b60521c5ebc69 Mon Sep 17 00:00:00 2001
-From: Daniel Baumann <mail@daniel-baumann.ch>
-Date: Mon, 10 Nov 2014 14:18:04 +0100
-Subject: [PATCH] Dropping usage of /etc/fstab.d since util-linux removed it,
- thanks to Evgeni Golov <evgeni+git@golov.de> for reporting it.
-
----
- components/3020-swap | 8 ++++----
- components/9990-fstab.sh | 8 ++++----
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/components/3020-swap b/components/3020-swap
-index a1bcdbe..345b9a0 100755
---- a/components/3020-swap
-+++ b/components/3020-swap
-@@ -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 --git a/components/9990-fstab.sh b/components/9990-fstab.sh
-index 5ae9546..a8d9123 100755
---- a/components/9990-fstab.sh
-+++ b/components/9990-fstab.sh
-@@ -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
---
-2.1.3
-
-.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
-.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
.\" 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
.\" 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
.\" 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 \- システム起動構成要素
.\" 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 状態保持用メディアの設定ファイル
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"
#. 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
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"
#. 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
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"
#. 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
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"
#. 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
#, 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"
#. 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
#, 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"
#. 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