[SCM] live-boot branch, upstream, updated. upstream/2.0.0-1-gf714f27
Daniel Baumann
daniel at debian.org
Wed Sep 1 16:28:59 UTC 2010
The following commit has been merged in the upstream branch:
commit f714f2789f92fc52a8d5d8a0ccdf53cd559ae692
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Sep 1 18:26:03 2010 +0200
Adding upstream version 2.0.1.
diff --git a/VERSION b/VERSION
index 227cea2..38f77a6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.0
+2.0.1
diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index ad87ec1..7bb396f 100644
--- 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 10.08.2010 2.0.0 "Debian Live Projekt"
+.TH LIVE\-BOOT 7 01.09.2010 2.0.1 "Debian Live Projekt"
.SH NAME
\fBlive\-boot\fP \- System Boot Skripte
diff --git a/manpages/de/live-snapshot.de.1 b/manpages/de/live-snapshot.de.1
index c71c530..5801fd5 100644
--- a/manpages/de/live-snapshot.de.1
+++ b/manpages/de/live-snapshot.de.1
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT 1 10.08.2010 2.0.0 "Debian Live Projekt"
+.TH LIVE\-BOOT 1 01.09.2010 2.0.1 "Debian Live Projekt"
.SH NAME
\fBlive\-snapshot\fP \- simple script to ease persistence usage
diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7
index b1a31c5..5f5a357 100644
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2010\-08\-10 2.0.0 "Debian Live Project"
+.TH LIVE\-BOOT 7 2010\-09\-01 2.0.1 "Debian Live Project"
.SH NAME
\fBlive\-boot\fR \- System Boot Scripts
diff --git a/manpages/en/live-snapshot.1 b/manpages/en/live-snapshot.1
index c5a47b3..224b6c9 100644
--- a/manpages/en/live-snapshot.1
+++ b/manpages/en/live-snapshot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 1 2010\-08\-10 2.0.0 "Debian Live Project"
+.TH LIVE\-BOOT 1 2010\-09\-01 2.0.1 "Debian Live Project"
.SH NAME
\fBlive\-snapshot\fR \- simple script to ease persistence usage
diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po
index eeb82af..c575f31 100644
--- 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 2.0.0\n"
-"POT-Creation-Date: 2010-08-10 01:48+0300\n"
+"Project-Id-Version: live-boot 2.0.1\n"
+"POT-Creation-Date: 2010-09-01 18:24+0300\n"
"PO-Revision-Date: 2010-05-24 12:34+0300\n"
"Last-Translator: Daniel Baumann <daniel at debian.org>\n"
"Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-BOOT"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2010-08-10"
-msgstr "10.08.2010"
+msgid "2010-09-01"
+msgstr "01.09.2010"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2.0.0"
-msgstr "2.0.0"
+msgid "2.0.1"
+msgstr "2.0.1"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
diff --git a/manpages/po/de/live-snapshot.1.po b/manpages/po/de/live-snapshot.1.po
index fdf2222..cc84ef0 100644
--- a/manpages/po/de/live-snapshot.1.po
+++ b/manpages/po/de/live-snapshot.1.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-boot 2.0.0\n"
-"POT-Creation-Date: 2010-08-10 01:48+0300\n"
+"Project-Id-Version: live-boot 2.0.1\n"
+"POT-Creation-Date: 2010-09-01 18:24+0300\n"
"PO-Revision-Date: 2010-05-24 12:34+0300\n"
"Last-Translator: Daniel Baumann <daniel at debian.org>\n"
"Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-BOOT"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2010-08-10"
-msgstr "10.08.2010"
+msgid "2010-09-01"
+msgstr "01.09.2010"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2.0.0"
-msgstr "2.0.0"
+msgid "2.0.1"
+msgstr "2.0.1"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot
index 659b6ac..1b54650 100644
--- a/manpages/pot/live-boot.7.pot
+++ b/manpages/pot/live-boot.7.pot
@@ -7,13 +7,14 @@
msgid ""
msgstr ""
"Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2010-08-10 01:48+0300\n"
+"POT-Creation-Date: 2010-09-01 18:24+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING"
+"Content-Transfer-Encoding: 8bit\n"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
@@ -24,13 +25,13 @@ msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2010-08-10"
+msgid "2010-09-01"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2.0.0"
+msgid "2.0.1"
msgstr ""
#. type: TH
diff --git a/manpages/pot/live-snapshot.1.pot b/manpages/pot/live-snapshot.1.pot
index b48810c..b3ea6b2 100644
--- a/manpages/pot/live-snapshot.1.pot
+++ b/manpages/pot/live-snapshot.1.pot
@@ -7,13 +7,14 @@
msgid ""
msgstr ""
"Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2010-08-10 01:48+0300\n"
+"POT-Creation-Date: 2010-09-01 18:24+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING"
+"Content-Transfer-Encoding: 8bit\n"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
@@ -24,13 +25,13 @@ msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2010-08-10"
+msgid "2010-09-01"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2.0.0"
+msgid "2.0.1"
msgstr ""
#. type: TH
diff --git a/scripts/live b/scripts/live
index a17eb42..e660ac4 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1813,6 +1813,12 @@ mountroot ()
mount --move /live/image /root/live/image
fi
+ # aufs2 in kernel versions around 2.6.33 has a regression:
+ # directories can't be accessed when read for the first the time,
+ # causing a failure for example when accessing /var/lib/fai
+ # when booting FAI, this simple workaround solves it
+ ls /root/* >/dev/null 2>&1
+
maybe_break live-bottom
log_begin_msg "Running /scripts/live-bottom\n"
diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking
index 871d8c0..f023729 100755
--- a/scripts/live-bottom/23networking
+++ b/scripts/live-bottom/23networking
@@ -61,7 +61,7 @@ then
ifgateway="$(echo ${ifline} | cut -f4 -d ',')"
cat >> "${IFFILE}" << EOF
-auto ${ifname}
+allow-hotplug ${ifname}
iface ${ifname} inet static
address ${ifaddress}
netmask ${ifnetmask}
@@ -90,7 +90,7 @@ else
i="$(basename ${interface})"
cat >> "${IFFILE}" << EOF
-auto ${i}
+allow-hotplug ${i}
iface ${i} inet ${method}
EOF
@@ -138,7 +138,7 @@ fi
# grep -q "iface ${i}" ${IFFILE} && continue
#
#cat >> "${IFFILE}" << EOF
-#auto ${i}
+#allow-hotplug ${i}
#iface ${i} inet dhcp
#
#EOF
--
live-boot
More information about the debian-live-changes
mailing list