Adding upstream version 2.0~a16.

diff --git a/Makefile b/Makefile
index b24d4f8..915f864 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -19,27 +19,24 @@ test:
 
        @echo " done."
 
-       @if [ ! -x "$$(which checkbashisms 2>/dev/null)" ]; \
+       @# We can't just fail yet on bashisms (FIXME)
+       @if [ -x "$$(which checkbashisms 2>/dev/null)" ]; \
        then \
+               echo -n "Checking for bashisms"; \
+               for SCRIPT in $(SCRIPTS); \
+               do \
+                       checkbashisms -f -x $${SCRIPT} || true; \
+                       echo -n "."; \
+               done; \
+               echo " done."; \
+       else \
                echo "W: checkbashisms - command not found"; \
                echo "I: checkbashisms can be optained from: "; \
                echo "I:   http://git.debian.org/?p=devscripts/devscripts.git"; \
                echo "I: On Debian systems, checkbashisms can be installed with:"; \
                echo "I:   apt-get install devscripts"; \
-               exit 0; \
        fi
 
-       @echo -n "Checking for bashisms"
-
-       @# We can't just fail yet on bashisms (FIXME)
-       @for SCRIPT in $(SCRIPTS); \
-       do \
-               checkbashisms -f -x $${SCRIPT} || true; \
-               echo -n "."; \
-       done
-
-       @echo " done."
-
 build:
        @echo "Nothing to build."
 

diff --git a/VERSION b/VERSION
index 92fbbba..9e45139 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0~a15
+2.0~a16

diff --git a/hooks/live b/hooks/live
index d87bfe7..34d6eab 100755 (executable)
--- a/hooks/live
+++ b/hooks/live
@@ -24,6 +24,20 @@ esac
 
 # live-boot hook
 
+# Reading configuration file from filesystem
+if [ -e /etc/live/boot.conf ]
+then
+       . /etc/live/boot.conf
+fi
+
+if ls /etc/live/boot.conf.d/* > /dev/null 2>&1
+then
+       for _FILE in /etc/live/boot.conf.d/*
+       do
+               . ${_FILE}
+       done
+fi
+
 # Handling live-boot
 
 # Configuration
@@ -226,3 +240,14 @@ then
     manual_add_modules iscsi_tcp
     manual_add_modules crc32c
 fi
+
+if [ "${LIVE_DNS}" = "true" ]
+then
+       #copy_exec /lib/libnss_files.so.*      /lib  # /etc/hosts and /etc/passwd
+       copy_exec /lib/libnss_dns.so.*      /lib  # DNS server
+       #copy_exec /lib/libnss_compat.so.*      /lib  # /etc/passwd
+
+       # Configuration file - may be needed if /etc/hosts is used.
+       #mkdir -p $DESTDIR/etc
+       #cp -p /etc/nsswitch.conf $DESTDIR/etc
+fi

diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index 2b34f71..bc9f3ed 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 17.07.2010 2.0~a15 "Debian Live Projekt"
+.TH LIVE\-BOOT 7 28.07.2010 2.0~a16 "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 633ec1b..26fcf91 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 17.07.2010 2.0~a15 "Debian Live Projekt"
+.TH LIVE\-BOOT 1 28.07.2010 2.0~a16 "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 c99d1ea..78418e3 100644 (file)
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2010\-07\-17 2.0~a15 "Debian Live Project"
+.TH LIVE\-BOOT 7 2010\-07\-28 2.0~a16 "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 e778c37..497dd5d 100644 (file)
--- a/manpages/en/live-snapshot.1
+++ b/manpages/en/live-snapshot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 1 2010\-07\-17 2.0~a15 "Debian Live Project"
+.TH LIVE\-BOOT 1 2010\-07\-28 2.0~a16 "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 d871206..9828577 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 2.0~a15\n"
-"POT-Creation-Date: 2010-07-17 17:19+0300\n"
+"Project-Id-Version: live-boot 2.0~a16\n"
+"POT-Creation-Date: 2010-07-28 20:17+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-07-17"
-msgstr "17.07.2010"
+msgid "2010-07-28"
+msgstr "28.07.2010"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2.0~a15"
-msgstr "2.0~a15"
+msgid "2.0~a16"
+msgstr "2.0~a16"
 
 #. 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 42cff6f..a8e4bb0 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 2.0~a15\n"
-"POT-Creation-Date: 2010-07-17 17:19+0300\n"
+"Project-Id-Version: live-boot 2.0~a16\n"
+"POT-Creation-Date: 2010-07-28 20:17+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-07-17"
-msgstr "17.07.2010"
+msgid "2010-07-28"
+msgstr "28.07.2010"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2.0~a15"
-msgstr "2.0~a15"
+msgid "2.0~a16"
+msgstr "2.0~a16"
 
 #. 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 5ede250..e21b522 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-07-17 17:19+0300\n"
+"POT-Creation-Date: 2010-07-28 20:17+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"
@@ -24,13 +24,13 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2010-07-17"
+msgid "2010-07-28"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2.0~a15"
+msgid "2.0~a16"
 msgstr ""
 
 #. type: TH

diff --git a/manpages/pot/live-snapshot.1.pot b/manpages/pot/live-snapshot.1.pot
index 4162ba9..3ac93d7 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-07-17 17:19+0300\n"
+"POT-Creation-Date: 2010-07-28 20:17+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"
@@ -24,13 +24,13 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2010-07-17"
+msgid "2010-07-28"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2.0~a15"
+msgid "2.0~a16"
 msgstr ""
 
 #. type: TH

diff --git a/scripts/live b/scripts/live
index f5f4ad2..a17eb42 100755 (executable)
--- a/scripts/live
+++ b/scripts/live
@@ -639,6 +639,22 @@ do_netsetup ()
                HWADDR="$(cat /sys/class/net/${DEVICE}/address)"
        fi
 
+       if [ ! -e "/etc/resolv.conf" ]
+       then
+               echo "Creating /etc/resolv.conf"
+
+               if [ -n "${DNSDOMAIN}" ]
+               then
+                       echo "domain ${DNSDOMAIN}" > /etc/resolv.conf
+                       echo "search ${DNSDOMAIN}" > /etc/resolv.conf
+               fi
+
+               for i in ${IPV4DNS0} ${IPV4DNS1} ${IPV4DNS1}
+               do
+                       echo "nameserver $i" >> /etc/resolv.conf
+               done
+       fi
+
        # Check if we have a network device at all
        if ! ls /sys/class/net/"$DEVICE" > /dev/null 2>&1 && \
           ! ls /sys/class/net/eth0 > /dev/null 2>&1 && \
@@ -785,7 +801,7 @@ do_httpmount ()
                                                fi
                                                modprobe fuse
                                                $FUSE_MOUNT "${url}" "${dest}"
-                                               FUSE_PID="$(minips h -C "$FUSE_MOUNT" | { read x y ; echo "$x" ; } )"
+                                               ROOT_PID="$(minips h -C "$FUSE_MOUNT" | { read x y ; echo "$x" ; } )"
                                        fi
                                        [ ${?} -eq 0 ] && rc=0
                                        [ "${extension}" = "tgz" ] && live_dest="ram"
@@ -816,9 +832,6 @@ do_httpmount ()
        elif [ "${webfile}"  != "FETCH" ] ; then
                NETBOOT="${webfile}"
                export NETBOOT
-               if [ -n "${FUSE_PID}" ] ; then
-                       echo "${FUSE_PID}" > ${mountpoint}/root.pid
-               fi
        fi
 
        return ${rc}
@@ -1779,6 +1792,11 @@ mountroot ()
                mount_images_in_directory "${livefs_root}" "${rootmnt}" "${mac}"
        fi
 
+
+       if [ -n "${ROOT_PID}" ] ; then
+               echo "${ROOT_PID}" > "${rootmnt}"/live/root.pid
+       fi
+
        log_end_msg
 
        # unionfs-fuse needs /dev to be bind-mounted for the duration of