Adding upstream version 3.0~a3.

diff --git a/VERSION b/VERSION
index 3ccf2a7..2f4c7df 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~a2
+3.0~a3

diff --git a/hooks/live b/hooks/live
index c2292d5..19ff26a 100755 (executable)
--- a/hooks/live
+++ b/hooks/live
@@ -61,7 +61,7 @@ cp /usr/share/initramfs-tools/scripts/live-helpers "${DESTDIR}"/scripts
 # klibc dependencies
 for FILE in /lib/libacl* /lib/libblkid* /lib/libuuid* /lib/libdevmapper* /lib/libattr*
 do
-       if [ ! -e "${DESTDIR}"/"${FILE}" ]
+       if [ ! -e "${DESTDIR}"/"${FILE}" ] && ls ${FILE} > /dev/null 2>&1
        then
                cp -a "${FILE}" "${DESTDIR}"/"${FILE}"
        fi

diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index a2ed194..aedc998 100644 (file)
--- 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 01.09.2010 3.0~a2 "Debian Live Projekt"
+.TH LIVE\-BOOT 7 02.09.2010 3.0~a3 "Debian Live Projekt"
 
 .SH NAME
 \fBlive\-boot\fP \- System Boot Skripte
@@ -243,9 +243,11 @@ directory with a tmpfs on the original path.
 .SH "SIEHE AUCH"
 \fIlive\-snapshot\fP(1)
 .PP
+\fIlive\-build\fP(7)
+.PP
 \fIlive\-config\fP(7)
 .PP
-\fIlive\-helper\fP(7)
+\fIlive\-tools\fP(7)
 
 .SH HOMEPAGE
 Weitere Informationen ueber live\-boot und das Debian Live Projekt koennen

diff --git a/manpages/de/live-snapshot.de.1 b/manpages/de/live-snapshot.de.1
index 01a4635..eada7a1 100644 (file)
--- 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 01.09.2010 3.0~a2 "Debian Live Projekt"
+.TH LIVE\-BOOT 1 02.09.2010 3.0~a3 "Debian Live Projekt"
 
 .SH NAME
 \fBlive\-snapshot\fP \- simple script to ease persistence usage
@@ -87,9 +87,11 @@ directory with a tmpfs on the original path.
 .SH "SIEHE AUCH"
 \fIlive\-boot\fP(1)
 .PP
+\fIlive\-build\fP(7)
+.PP
 \fIlive\-config\fP(7)
 .PP
-\fIlive\-helper\fP(7)
+\fIlive\-tools\fP(7)
 
 .SH HOMEPAGE
 Weitere Informationen ueber live\-boot und das Debian Live Projekt koennen

diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7
index 09de308..61d07bf 100644 (file)
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2010\-09\-01 3.0~a2 "Debian Live Project"
+.TH LIVE\-BOOT 7 2010\-09\-02 3.0~a3 "Debian Live Project"
 
 .SH NAME
 \fBlive\-boot\fR \- System Boot Scripts
@@ -143,9 +143,11 @@ This saves expensive writes and speeds up operations on volatile data such as we
 .SH SEE ALSO
 \fIlive\-snapshot\fR(1)
 .PP
+\fIlive\-build\fR(7)
+.PP
 \fIlive\-config\fR(7)
 .PP
-\fIlive\-helper\fR(7)
+\fIlive\-tools\fR(7)
 
 .SH HOMEPAGE
 More information about live\-boot and the Debian Live project can be found on the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.

diff --git a/manpages/en/live-snapshot.1 b/manpages/en/live-snapshot.1
index b73c6aa..daf567f 100644 (file)
--- a/manpages/en/live-snapshot.1
+++ b/manpages/en/live-snapshot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 1 2010\-09\-01 3.0~a2 "Debian Live Project"
+.TH LIVE\-BOOT 1 2010\-09\-02 3.0~a3 "Debian Live Project"
 
 .SH NAME
 \fBlive\-snapshot\fR \- simple script to ease persistence usage
@@ -52,9 +52,11 @@ This saves expensive writes and speeds up operations on volatile data such as we
 .SH SEE ALSO
 \fIlive\-boot\fR(1)
 .PP
+\fIlive\-build\fR(7)
+.PP
 \fIlive\-config\fR(7)
 .PP
-\fIlive\-helper\fR(7)
+\fIlive\-tools\fR(7)
 
 .SH HOMEPAGE
 More information about live\-boot and the Debian Live project can be found on the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.

diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po
index 2d8de5f..8e94fea 100644 (file)
--- 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 3.0~a2\n"
-"POT-Creation-Date: 2010-08-10 02:01+0300\n"
+"Project-Id-Version: live-boot 3.0~a3\n"
+"POT-Creation-Date: 2010-09-02 18:30+0300\n"
 "PO-Revision-Date: 2010-05-24 12:34+0300\n"
 "Last-Translator: Daniel Baumann <daniel@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-09-01"
-msgstr "01.09.2010"
+msgid "2010-09-02"
+msgstr "02.09.2010"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "3.0~a2"
-msgstr "3.0~a2"
+msgid "3.0~a3"
+msgstr "3.0~a3"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
@@ -771,22 +771,27 @@ msgstr "I<live-snapshot>(1)"
 
 #. type: Plain text
 #: en/live-boot.7:147 en/live-snapshot.1:56
+msgid "I<live-build>(7)"
+msgstr "I<live-build>(7)"
+
+#. type: Plain text
+#: en/live-boot.7:149 en/live-snapshot.1:58
 msgid "I<live-config>(7)"
 msgstr "I<live-config>(7)"
 
 #. type: Plain text
-#: en/live-boot.7:149 en/live-snapshot.1:58
-msgid "I<live-helper>(7)"
-msgstr "I<live-helper>(7)"
+#: en/live-boot.7:151 en/live-snapshot.1:60
+msgid "I<live-tools>(7)"
+msgstr "I<live-tools>(7)"
 
 #. type: SH
-#: en/live-boot.7:150 en/live-snapshot.1:59
+#: en/live-boot.7:152 en/live-snapshot.1:61
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr "HOMEPAGE"
 
 #. type: Plain text
-#: en/live-boot.7:152 en/live-snapshot.1:61
+#: en/live-boot.7:154 en/live-snapshot.1:63
 msgid ""
 "More information about live-boot and the Debian Live project can be found on "
 "the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -797,13 +802,13 @@ msgstr ""
 "unter E<lt>I<http://live.debian.net/manual/>E<gt> gefunden werden."
 
 #. type: SH
-#: en/live-boot.7:153 en/live-snapshot.1:62
+#: en/live-boot.7:155 en/live-snapshot.1:64
 #, no-wrap
 msgid "BUGS"
 msgstr "FEHLER"
 
 #. type: Plain text
-#: en/live-boot.7:155 en/live-snapshot.1:64
+#: en/live-boot.7:157 en/live-snapshot.1:66
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-boot package in "
 "the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -817,13 +822,13 @@ msgstr ""
 "werden."
 
 #. type: SH
-#: en/live-boot.7:156 en/live-snapshot.1:65
+#: en/live-boot.7:158 en/live-snapshot.1:67
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTOR"
 
 #. type: Plain text
-#: en/live-boot.7:157 en/live-snapshot.1:66
+#: en/live-boot.7:159 en/live-snapshot.1:68
 msgid ""
 "live-boot was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
 "the Debian project."

diff --git a/manpages/po/de/live-snapshot.1.po b/manpages/po/de/live-snapshot.1.po
index 316d431..66233f7 100644 (file)
--- 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 3.0~a2\n"
-"POT-Creation-Date: 2010-08-10 02:01+0300\n"
+"Project-Id-Version: live-boot 3.0~a3\n"
+"POT-Creation-Date: 2010-09-02 18:30+0300\n"
 "PO-Revision-Date: 2010-05-24 12:34+0300\n"
 "Last-Translator: Daniel Baumann <daniel@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-09-01"
-msgstr "01.09.2010"
+msgid "2010-09-02"
+msgstr "02.09.2010"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "3.0~a2"
-msgstr "3.0~a2"
+msgid "3.0~a3"
+msgstr "3.0~a3"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
@@ -127,22 +127,27 @@ msgstr "SIEHE AUCH"
 
 #. type: Plain text
 #: en/live-boot.7:147 en/live-snapshot.1:56
+msgid "I<live-build>(7)"
+msgstr "I<live-build>(7)"
+
+#. type: Plain text
+#: en/live-boot.7:149 en/live-snapshot.1:58
 msgid "I<live-config>(7)"
 msgstr "I<live-config>(7)"
 
 #. type: Plain text
-#: en/live-boot.7:149 en/live-snapshot.1:58
-msgid "I<live-helper>(7)"
-msgstr "I<live-helper>(7)"
+#: en/live-boot.7:151 en/live-snapshot.1:60
+msgid "I<live-tools>(7)"
+msgstr "I<live-tools>(7)"
 
 #. type: SH
-#: en/live-boot.7:150 en/live-snapshot.1:59
+#: en/live-boot.7:152 en/live-snapshot.1:61
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr "HOMEPAGE"
 
 #. type: Plain text
-#: en/live-boot.7:152 en/live-snapshot.1:61
+#: en/live-boot.7:154 en/live-snapshot.1:63
 msgid ""
 "More information about live-boot and the Debian Live project can be found on "
 "the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -153,13 +158,13 @@ msgstr ""
 "unter E<lt>I<http://live.debian.net/manual/>E<gt> gefunden werden."
 
 #. type: SH
-#: en/live-boot.7:153 en/live-snapshot.1:62
+#: en/live-boot.7:155 en/live-snapshot.1:64
 #, no-wrap
 msgid "BUGS"
 msgstr "FEHLER"
 
 #. type: Plain text
-#: en/live-boot.7:155 en/live-snapshot.1:64
+#: en/live-boot.7:157 en/live-snapshot.1:66
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-boot package in "
 "the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -173,13 +178,13 @@ msgstr ""
 "werden."
 
 #. type: SH
-#: en/live-boot.7:156 en/live-snapshot.1:65
+#: en/live-boot.7:158 en/live-snapshot.1:67
 #, no-wrap
 msgid "AUTHOR"
 msgstr "AUTOR"
 
 #. type: Plain text
-#: en/live-boot.7:157 en/live-snapshot.1:66
+#: en/live-boot.7:159 en/live-snapshot.1:68
 msgid ""
 "live-boot was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
 "the Debian project."

diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot
index 974a6fd..b3503e7 100644 (file)
--- a/manpages/pot/live-boot.7.pot
+++ b/manpages/pot/live-boot.7.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2010-09-01 18:28+0300\n"
+"POT-Creation-Date: 2010-09-02 18:30+0300\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/live-snapshot.1:1
 #, no-wrap
-msgid "2010-09-01"
+msgid "2010-09-02"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "3.0~a2"
+msgid "3.0~a3"
 msgstr ""
 
 #. type: TH
@@ -766,22 +766,27 @@ msgstr ""
 
 #. type: Plain text
 #: en/live-boot.7:147 en/live-snapshot.1:56
-msgid "I<live-config>(7)"
+msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text
 #: en/live-boot.7:149 en/live-snapshot.1:58
-msgid "I<live-helper>(7)"
+msgid "I<live-config>(7)"
+msgstr ""
+
+#. type: Plain text
+#: en/live-boot.7:151 en/live-snapshot.1:60
+msgid "I<live-tools>(7)"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:150 en/live-snapshot.1:59
+#: en/live-boot.7:152 en/live-snapshot.1:61
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:152 en/live-snapshot.1:61
+#: en/live-boot.7:154 en/live-snapshot.1:63
 msgid ""
 "More information about live-boot and the Debian Live project can be found on "
 "the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -789,13 +794,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:153 en/live-snapshot.1:62
+#: en/live-boot.7:155 en/live-snapshot.1:64
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:155 en/live-snapshot.1:64
+#: en/live-boot.7:157 en/live-snapshot.1:66
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-boot package in "
 "the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -804,13 +809,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:156 en/live-snapshot.1:65
+#: en/live-boot.7:158 en/live-snapshot.1:67
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:157 en/live-snapshot.1:66
+#: en/live-boot.7:159 en/live-snapshot.1:68
 msgid ""
 "live-boot was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
 "the Debian project."

diff --git a/manpages/pot/live-snapshot.1.pot b/manpages/pot/live-snapshot.1.pot
index bd8c239..4d54a8c 100644 (file)
--- a/manpages/pot/live-snapshot.1.pot
+++ b/manpages/pot/live-snapshot.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2010-09-01 18:28+0300\n"
+"POT-Creation-Date: 2010-09-02 18:30+0300\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/live-snapshot.1:1
 #, no-wrap
-msgid "2010-09-01"
+msgid "2010-09-02"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "3.0~a2"
+msgid "3.0~a3"
 msgstr ""
 
 #. type: TH
@@ -128,22 +128,27 @@ msgstr ""
 
 #. type: Plain text
 #: en/live-boot.7:147 en/live-snapshot.1:56
-msgid "I<live-config>(7)"
+msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text
 #: en/live-boot.7:149 en/live-snapshot.1:58
-msgid "I<live-helper>(7)"
+msgid "I<live-config>(7)"
+msgstr ""
+
+#. type: Plain text
+#: en/live-boot.7:151 en/live-snapshot.1:60
+msgid "I<live-tools>(7)"
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:150 en/live-snapshot.1:59
+#: en/live-boot.7:152 en/live-snapshot.1:61
 #, no-wrap
 msgid "HOMEPAGE"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:152 en/live-snapshot.1:61
+#: en/live-boot.7:154 en/live-snapshot.1:63
 msgid ""
 "More information about live-boot and the Debian Live project can be found on "
 "the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -151,13 +156,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:153 en/live-snapshot.1:62
+#: en/live-boot.7:155 en/live-snapshot.1:64
 #, no-wrap
 msgid "BUGS"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:155 en/live-snapshot.1:64
+#: en/live-boot.7:157 en/live-snapshot.1:66
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-boot package in "
 "the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -166,13 +171,13 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: en/live-boot.7:156 en/live-snapshot.1:65
+#: en/live-boot.7:158 en/live-snapshot.1:67
 #, no-wrap
 msgid "AUTHOR"
 msgstr ""
 
 #. type: Plain text
-#: en/live-boot.7:157 en/live-snapshot.1:66
+#: en/live-boot.7:159 en/live-snapshot.1:68
 msgid ""
 "live-boot was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
 "the Debian project."

diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking
index f023729..8c856c6 100755 (executable)
--- a/scripts/live-bottom/23networking
+++ b/scripts/live-bottom/23networking
@@ -51,14 +51,14 @@ udevadm settle
 
 if [ -z "${NETBOOT}" -a -n "${STATICIP}" -a "${STATICIP}" != "frommedia" ]
 then
-       parsed=$(echo "${STATICIP}" | sed -e 's/:/ /g')
+       parsed=$(echo "${STATICIP}" | sed -e 's/,/ /g')
 
        for ifline in ${parsed}
        do
-               ifname="$(echo ${ifline} | cut -f1 -d ',')"
-               ifaddress="$(echo ${ifline} | cut -f2 -d ',')"
-               ifnetmask="$(echo ${ifline} | cut -f3 -d ',')"
-               ifgateway="$(echo ${ifline} | cut -f4 -d ',')"
+               ifname="$(echo ${ifline} | cut -f1 -d ':')"
+               ifaddress="$(echo ${ifline} | cut -f2 -d ':')"
+               ifnetmask="$(echo ${ifline} | cut -f3 -d ':')"
+               ifgateway="$(echo ${ifline} | cut -f4 -d ':')"
 
 cat >> "${IFFILE}" << EOF
 allow-hotplug ${ifname}