Merge commit 'debian/3.0_a17-1' into debian

diff --git a/Makefile b/Makefile
index cb931ca..4e579a3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 SHELL := sh -e
 
-LANGUAGES = de
+LANGUAGES = en $(shell cd manpages/po && ls)
 
 SCRIPTS = bin/* hooks/* scripts/live scripts/live-functions scripts/live-helpers scripts/*/*
 

diff --git a/VERSION b/VERSION
index 299c09b..31cfe14 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~a16
+3.0~a17

diff --git a/debian/changelog b/debian/changelog
index f04d099..262ac0d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+live-boot (3.0~a17-1) unstable; urgency=low
+
+  [ Daniel Baumann ]
+  * Updating to standards version 3.9.2.
+  * Using /run/initramfs instead of /dev/.initramfs/varrun for unionfs-
+    fuse sendsigs (Closes: #621908).
+  * Updating manpage wrt/ ip parameter squence (Closes: #616197).
+  * Making copyright file distribution neutral.
+  * Correcting top-level makefile to automatically get all the supported
+    languages, rather than defining a static list.
+
+  [ Michal Suchanek ]
+  * Copy resolv.conf to live system root (Closes: #627178).
+  * Tidy up resolv.conf a bit.
+
+ -- Daniel Baumann <daniel@debian.org>  Wed, 18 May 2011 19:31:27 +0200
+
 live-boot (3.0~a16-1) unstable; urgency=low
 
   * Adding old 2.x changelog entries in debian changelog.

diff --git a/debian/control b/debian/control
index bc4a786..e335732 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Live Project <debian-live@lists.debian.org>
 Uploaders: Daniel Baumann <daniel@debian.org>
 Build-Depends: debhelper (>= 8)
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Homepage: http://live.debian.net/devel/live-boot/
 Vcs-Browser: http://live.debian.net/gitweb/?p=live-boot.git
 Vcs-Git: git://live.debian.net/git/live-boot.git

diff --git a/debian/copyright b/debian/copyright
index 0a7e07a..d0a002d 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -19,5 +19,5 @@ License: GPL-3+
  You should have received a copy of the GNU General Public License
  along with this program. If not, see <http://www.gnu.org/licenses/>.
  .
- On Debian systems, the complete text of the GNU General Public License
+ The complete text of the GNU General Public License
  can be found in /usr/share/common-licenses/GPL-3 file.

diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index 48fa818..b462e99 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 2011\-03\-14 3.0~a16 "Debian Live Projekt"
+.TH LIVE\-BOOT 7 2011\-05\-18 3.0~a17 "Debian Live Projekt"
 
 .SH NAME
 \fBlive\-boot\fP \- System Boot Skripte
@@ -103,7 +103,7 @@ LIVE_GENERATE_UUID=1 when building the initramfs.
 If specified, an MD5 sum is calculated on the live media during boot and
 compared to the value found in md5sum.txt found in the root directory of the
 live media.
-.IP "\fBip\fP=[\fICLIENT_IP\fP]:[\fISERVER_IP\fP]:[\fIGATEWAY_IP\fP]:[\fINETMASK\fP]:[\fIHOSTNAME\fP]:[\fIDEVICE\fP]:[\fIAUTOCONF\fP] [,[\fICLIENT_IP\fP]:[\fISERVER_IP\fP]:[\fIGATEWAY_IP\fP]:[\fINETMASK\fP]:[\fIHOSTNAME\fP]:[\fIDEVICE\fP]:[\fIAUTOCONF\fP]]" 4
+.IP "\fBip\fP=[\fIDEVICE\fP]:[\fICLIENT_IP\fP]:[\fISERVER_IP\fP]:[\fIGATEWAY_IP\fP]:[\fINETMASK\fP]:[\fIHOSTNAME\fP]:[\fIAUTOCONF\fP] [,[\fIDEVICE\fP]:[\fICLIENT_IP\fP]:[\fISERVER_IP\fP]:[\fIGATEWAY_IP\fP]:[\fINETMASK\fP]:[\fIHOSTNAME\fP]:[\fIAUTOCONF\fP]]" 4
 Let you specify the name(s) and the options of the interface(s) that should
 be configured at boot time. Do not specify this if you want to use dhcp
 (default). It will be changed in a future release to mimick official kernel

diff --git a/manpages/de/live-snapshot.de.1 b/manpages/de/live-snapshot.de.1
index 748b39f..cfe6968 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 2011\-03\-14 3.0~a16 "Debian Live Projekt"
+.TH LIVE\-BOOT 1 2011\-05\-18 3.0~a17 "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 63629f0..c353617 100644 (file)
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2011\-03\-14 3.0~a16 "Debian Live Project"
+.TH LIVE\-BOOT 7 2011\-05\-18 3.0~a17 "Debian Live Project"
 
 .SH NAME
 \fBlive\-boot\fR \- System Boot Scripts
@@ -70,7 +70,7 @@ Allows to use a filesystem from within an iso image that's available on live-med
 Do not check that any UUID embedded in the initramfs matches the discovered medium. live\-boot may be told to generate a UUID by setting LIVE_GENERATE_UUID=1 when building the initramfs.
 .IP "\fBintegrity\-check\fR" 4
 If specified, an MD5 sum is calculated on the live media during boot and compared to the value found in md5sum.txt found in the root directory of the live media.
-.IP "\fBip\fR=[\fICLIENT_IP\fR]:[\fISERVER_IP\fR]:[\fIGATEWAY_IP\fR]:[\fINETMASK\fR]:[\fIHOSTNAME\fR]:[\fIDEVICE\fR]:[\fIAUTOCONF\fR] [,[\fICLIENT_IP\fR]:[\fISERVER_IP\fR]:[\fIGATEWAY_IP\fR]:[\fINETMASK\fR]:[\fIHOSTNAME\fR]:[\fIDEVICE\fR]:[\fIAUTOCONF\fR]]" 4
+.IP "\fBip\fR=[\fIDEVICE\fR]:[\fICLIENT_IP\fR]:[\fISERVER_IP\fR]:[\fIGATEWAY_IP\fR]:[\fINETMASK\fR]:[\fIHOSTNAME\fR]:[\fIAUTOCONF\fR] [,[\fIDEVICE\fR]:[\fICLIENT_IP\fR]:[\fISERVER_IP\fR]:[\fIGATEWAY_IP\fR]:[\fINETMASK\fR]:[\fIHOSTNAME\fR]:[\fIAUTOCONF\fR]]" 4
 Let you specify the name(s) and the options of the interface(s) that should be configured at boot time. Do not specify this if you want to use dhcp (default). It will be changed in a future release to mimick official kernel boot param specification (e.g. ip=10.0.0.1::10.0.0.254:255.255.255.0::eth0,:::::eth1:dhcp).
 .IP "\fBip\fR=[\fIfrommedia\fR]" 4
 If this variable is set, dhcp and static configuration are just skipped and the system will use the (must be) media\-preconfigured /etc/network/interfaces instead.

diff --git a/manpages/en/live-snapshot.1 b/manpages/en/live-snapshot.1
index d9a4c60..2cbaa14 100644 (file)
--- a/manpages/en/live-snapshot.1
+++ b/manpages/en/live-snapshot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 1 2011\-03\-14 3.0~a16 "Debian Live Project"
+.TH LIVE\-BOOT 1 2011\-05\-18 3.0~a17 "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 f72224d..9f6b6d7 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~a16\n"
-"POT-Creation-Date: 2011-03-14 06:27+0100\n"
+"Project-Id-Version: live-boot 3.0~a17\n"
+"POT-Creation-Date: 2011-05-18 19: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,13 +24,14 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2011-03-14"
+msgid "2011-05-18"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
-msgid "3.0~a16"
-msgstr "3.0~a16"
+#, no-wrap
+msgid "3.0~a17"
+msgstr "3.0~a17"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
@@ -323,8 +324,8 @@ msgstr ""
 #. type: IP
 #: en/live-boot.7:73
 #, no-wrap
-msgid "B<ip>=[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<DEVICE>]:[I<AUTOCONF>] [,[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<DEVICE>]:[I<AUTOCONF>]]"
-msgstr "B<ip>=[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<DEVICE>]:[I<AUTOCONF>] [,[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<DEVICE>]:[I<AUTOCONF>]]"
+msgid "B<ip>=[I<DEVICE>]:[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<AUTOCONF>] [,[I<DEVICE>]:[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<AUTOCONF>]]"
+msgstr ""
 
 #. type: Plain text
 #: en/live-boot.7:75

diff --git a/manpages/po/de/live-snapshot.1.po b/manpages/po/de/live-snapshot.1.po
index 3b91f68..b4fc00b 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~a16\n"
-"POT-Creation-Date: 2011-03-14 06:27+0100\n"
+"Project-Id-Version: live-boot 3.0~a17\n"
+"POT-Creation-Date: 2011-05-18 19: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,13 +24,14 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2011-03-14"
+msgid "2011-05-18"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
-msgid "3.0~a16"
-msgstr "3.0~a16"
+#, no-wrap
+msgid "3.0~a17"
+msgstr "3.0~a17"
 
 #. 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 f9b085b..10ead51 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: 2011-03-14 06:27+0100\n"
+"POT-Creation-Date: 2011-05-18 19: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 "2011-03-14"
+msgid "2011-05-18"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "3.0~a16"
+msgid "3.0~a17"
 msgstr ""
 
 #. type: TH
@@ -319,7 +319,7 @@ msgstr ""
 #. type: IP
 #: en/live-boot.7:73
 #, no-wrap
-msgid "B<ip>=[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<DEVICE>]:[I<AUTOCONF>] [,[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<DEVICE>]:[I<AUTOCONF>]]"
+msgid "B<ip>=[I<DEVICE>]:[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<AUTOCONF>] [,[I<DEVICE>]:[I<CLIENT_IP>]:[I<SERVER_IP>]:[I<GATEWAY_IP>]:[I<NETMASK>]:[I<HOSTNAME>]:[I<AUTOCONF>]]"
 msgstr ""
 
 #. type: Plain text

diff --git a/manpages/pot/live-snapshot.1.pot b/manpages/pot/live-snapshot.1.pot
index a59628b..f88aa15 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: 2011-03-14 06:27+0100\n"
+"POT-Creation-Date: 2011-05-18 19: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 "2011-03-14"
+msgid "2011-05-18"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "3.0~a16"
+msgid "3.0~a17"
 msgstr ""
 
 #. type: TH

diff --git a/scripts/live b/scripts/live
index 8e0409a..57a4d32 100755 (executable)
--- a/scripts/live
+++ b/scripts/live
@@ -730,12 +730,15 @@ do_netsetup ()
                        if [ -n "${DNSDOMAIN}" ]
                        then
                                echo "domain ${DNSDOMAIN}" > /etc/resolv.conf
-                               echo "search ${DNSDOMAIN}" > /etc/resolv.conf
+                               echo "search ${DNSDOMAIN}" >> /etc/resolv.conf
                        fi
 
                        for i in ${IPV4DNS0} ${IPV4DNS1} ${IPV4DNS1}
                        do
-                               echo "nameserver $i" >> /etc/resolv.conf
+                               if [ -n "$i" ] && [ "$i" != 0.0.0.0 ]
+                               then
+                                       echo "nameserver $i" >> /etc/resolv.conf
+                               fi
                        done
                fi
 
@@ -1473,8 +1476,8 @@ setup_unionfs ()
                                unionmountopts="${unionmountopts} ${unionrw}=RW:${unionro}=RO"
                                ( sysctl -w fs.file-max=391524 ; ulimit -HSn 16384
                                unionfs-fuse ${unionmountopts} "${unionmountpoint}" ) && \
-                                       ( mkdir -p /dev/.initramfs/varrun
-                               pidof unionfs-fuse >> /dev/.initramfs/varrun/sendsigs.omit || true )
+                                       ( mkdir -p /run/initramfs
+                               pidof unionfs-fuse >> /run/initramfs/sendsigs.omit || true )
                                ;;
 
                        unionmount)
@@ -1942,6 +1945,13 @@ mountroot ()
                log_end_msg
        fi
 
+       if [ -f /etc/resolv.conf ] && [ ! -s ${rootmnt}/etc/resolv.conf ]
+       then
+               log_begin_msg "Copying /etc/resolv.conf to ${rootmnt}/etc/resolv.conf"
+               cp -v /etc/resolv.conf ${rootmnt}/etc/resolv.conf
+               log_end_msg
+       fi
+
        maybe_break live-bottom
        log_begin_msg "Running /scripts/live-bottom\n"