Adding upstream version 3.0~a36. upstream/3.0_a36
authorDaniel Baumann <daniel@debian.org>
Wed, 18 Jul 2012 22:01:27 +0000 (00:01 +0200)
committerDaniel Baumann <daniel@debian.org>
Wed, 18 Jul 2012 22:05:31 +0000 (00:05 +0200)
37 files changed:
VERSION
manpages/de/live-boot.de.7
manpages/de/live-persistence.conf.de.5
manpages/en/live-boot.7
manpages/en/live-persistence.conf.5
manpages/es/live-boot.es.7
manpages/es/live-persistence.conf.es.5
manpages/po/de/live-boot.7.po
manpages/po/de/live-persistence.conf.5.po
manpages/po/es/live-boot.7.po
manpages/po/es/live-persistence.conf.5.po
manpages/pot/live-boot.7.pot
manpages/pot/live-persistence.conf.5.pot
scripts/boot.sh
scripts/boot/0010-dracut [new file with mode: 0755]
scripts/boot/0020-initramfs-tools [new file with mode: 0755]
scripts/boot/0110-cmdline [new file with mode: 0755]
scripts/boot/0120-read-only [moved from scripts/boot/read-only.sh with 88% similarity]
scripts/boot/3010-verify-checksums [moved from scripts/boot/verify-checksums.sh with 100% similarity]
scripts/boot/3020-swapon [moved from scripts/boot/swapon.sh with 77% similarity]
scripts/boot/9990-aaa-fixme.sh [new file with mode: 0755]
scripts/boot/9990-cmdline-old [moved from scripts/boot/cmdline.sh with 94% similarity]
scripts/boot/9990-fstab.sh [moved from scripts/boot/fstab.sh with 100% similarity]
scripts/boot/9990-initramfs-tools.sh [moved from scripts/boot/initramfs-tools.sh with 100% similarity]
scripts/boot/9990-main.sh [moved from scripts/boot/mountroot.sh with 99% similarity]
scripts/boot/9990-misc-helpers.sh [moved from scripts/boot/misc-helpers.sh with 100% similarity]
scripts/boot/9990-mount-cifs.sh [moved from scripts/boot/mount-cifs.sh with 100% similarity]
scripts/boot/9990-mount-http.sh [moved from scripts/boot/mount-http.sh with 100% similarity]
scripts/boot/9990-mount-iscsi.sh [moved from scripts/boot/mount-iscsi.sh with 100% similarity]
scripts/boot/9990-mount-nfs.sh [moved from scripts/boot/mount-nfs.sh with 100% similarity]
scripts/boot/9990-netbase.sh [moved from scripts/boot/netbase.sh with 100% similarity]
scripts/boot/9990-netboot.sh [moved from scripts/boot/netboot.sh with 100% similarity]
scripts/boot/9990-networking.sh [moved from scripts/boot/networking.sh with 100% similarity]
scripts/boot/9990-overlay.sh [moved from scripts/boot/overlay.sh with 100% similarity]
scripts/boot/9990-select-eth-device.sh [moved from scripts/boot/select-eth-device.sh with 100% similarity]
scripts/boot/9990-toram-todisk.sh [moved from scripts/boot/toram-todisk.sh with 100% similarity]
scripts/boot/README [new file with mode: 0644]

diff --git a/VERSION b/VERSION
index c915247..6b82b43 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~a35-1
+3.0~a36-1
index c9ac3f1..4fee838 100644 (file)
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT 7 28.06.2012 3.0~a35\-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 18.07.2012 3.0~a36\-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-boot\fP \- System Boot Scripts
index 0070ce1..9bdf6b5 100644 (file)
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT conf 28.06.2012 3.0~a35\-1 "Debian Live Project"
+.TH LIVE\-BOOT conf 18.07.2012 3.0~a36\-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-persistence.conf\fP \- Configuration file for persistence media in
index 5badb72..36f222c 100644 (file)
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2012\-06\-28 3.0~a35-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 2012\-07\-18 3.0~a36-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-boot\fR \- System Boot Scripts
index 8d019f1..924683f 100644 (file)
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT conf 2012\-06\-28 3.0~a35-1 "Debian Live Project"
+.TH LIVE\-BOOT conf 2012\-07\-18 3.0~a36-1 "Debian Live Project"
 
 .SH NAME
 \fBlive-persistence.conf\fR \- Configuration file for persistence media in
index 88f4055..f23a4a7 100644 (file)
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT 7 28.06.2012 3.0~a35\-1 "Proyecto Debian Live"
+.TH LIVE\-BOOT 7 18.07.2012 3.0~a36\-1 "Proyecto Debian Live"
 
 .SH NOMBRE
 \fBlive\-boot\fP \- Scripts de Arranque del Sistema
index cc0e8d1..3952eea 100644 (file)
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT conf 28.06.2012 3.0~a35\-1 "Proyecto Debian Live"
+.TH LIVE\-BOOT conf 18.07.2012 3.0~a36\-1 "Proyecto Debian Live"
 
 .SH NOMBRE
 \fBlive\-persistence.conf\fP \- Fichero para configurar medios de almacenamiento
index 9d27fa1..a2777d8 100644 (file)
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot 3.0~a35-1\n"
-"POT-Creation-Date: 2012-06-28 14:28+0300\n"
+"POT-Creation-Date: 2012-07-18 23:56+0300\n"
 "PO-Revision-Date: 2012-04-08 22:48+0300\n"
 "Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
@@ -24,13 +24,13 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/live-persistence.conf.5:1
 #, no-wrap
-msgid "2012-06-28"
-msgstr "28.06.2012"
+msgid "2012-07-18"
+msgstr "18.07.2012"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-persistence.conf.5:1
 #, no-wrap
-msgid "3.0~a35-1"
+msgid "3.0~a36-1"
 msgstr ""
 
 #. type: TH
index 9546483..d2676e6 100644 (file)
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot 3.0~a35-1\n"
-"POT-Creation-Date: 2012-06-28 14:28+0300\n"
+"POT-Creation-Date: 2012-07-18 23:56+0300\n"
 "PO-Revision-Date: 2012-04-08 22:48+0300\n"
 "Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
@@ -24,13 +24,13 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/live-persistence.conf.5:1
 #, no-wrap
-msgid "2012-06-28"
-msgstr "28.06.2012"
+msgid "2012-07-18"
+msgstr "18.07.2012"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-persistence.conf.5:1
 #, no-wrap
-msgid "3.0~a35-1"
+msgid "3.0~a36-1"
 msgstr ""
 
 #. type: TH
index d0e52dc..01c9c12 100644 (file)
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot 3.0~a35-1\n"
-"POT-Creation-Date: 2012-06-28 14:28+0300\n"
+"POT-Creation-Date: 2012-07-18 23:56+0300\n"
 "PO-Revision-Date: 2012-06-07 20:29+0200\n"
 "Last-Translator: Carlos Zuferri «chals» <chals@altorricon.com>\n"
 "Language-Team:  none\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/live-persistence.conf.5:1
 #, no-wrap
-msgid "2012-06-28"
-msgstr "28.06.2012"
+msgid "2012-07-18"
+msgstr "18.07.2012"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-persistence.conf.5:1
 #, no-wrap
-msgid "3.0~a35-1"
-msgstr "3.0~a35-1"
+msgid "3.0~a36-1"
+msgstr "3.0~a36-1"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-persistence.conf.5:1
index c5438f8..86d9aad 100644 (file)
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot 3.0~a35-1\n"
-"POT-Creation-Date: 2012-06-28 14:28+0300\n"
+"POT-Creation-Date: 2012-07-18 23:56+0300\n"
 "PO-Revision-Date: 2012-06-07 19:11+0200\n"
 "Last-Translator: Carlos Zuferri «chals» <chals@altorricon.com>\n"
 "Language-Team:  none\n"
@@ -23,14 +23,14 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/live-persistence.conf.5:1
 #, no-wrap
-msgid "2012-06-28"
-msgstr "28.06.2012"
+msgid "2012-07-18"
+msgstr "18.07.2012"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-persistence.conf.5:1
 #, no-wrap
-msgid "3.0~a35-1"
-msgstr "3.0~a35-1"
+msgid "3.0~a36-1"
+msgstr "3.0~a36-1"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-persistence.conf.5:1
index bd226fd..d18a75b 100644 (file)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2012-06-28 14:28+0300\n"
+"POT-Creation-Date: 2012-07-18 23:56+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-persistence.conf.5:1
 #, no-wrap
-msgid "2012-06-28"
+msgid "2012-07-18"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/live-persistence.conf.5:1
 #, no-wrap
-msgid "3.0~a35-1"
+msgid "3.0~a36-1"
 msgstr ""
 
 #. type: TH
index 21032ec..e1e8fa5 100644 (file)
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2012-06-28 14:28+0300\n"
+"POT-Creation-Date: 2012-07-18 23:56+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-persistence.conf.5:1
 #, no-wrap
-msgid "2012-06-28"
+msgid "2012-07-18"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/live-persistence.conf.5:1
 #, no-wrap
-msgid "3.0~a35-1"
+msgid "3.0~a36-1"
 msgstr ""
 
 #. type: TH
index 9539496..c031f00 100755 (executable)
@@ -2,66 +2,10 @@
 
 # set -e
 
-if [ -e /scripts/functions ]
-then
-       # initramfs-tools specific (FIXME)
-       . /scripts/functions
-fi
-
-for _SCRIPT in /lib/live/boot/*
+for _SCRIPT in /lib/live/boot/????-*
 do
        if [ -e "${_SCRIPT}" ]
        then
                . ${_SCRIPT}
        fi
 done
-
-export PATH="/root/usr/bin:/root/usr/sbin:/root/bin:/root/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
-
-echo "/root/lib" >> /etc/ld.so.conf
-echo "/root/usr/lib" >> /etc/ld.so.conf
-
-mountpoint="/live/image"
-alt_mountpoint="/media"
-LIVE_MEDIA_PATH="live"
-
-HOSTNAME="host"
-
-mkdir -p "${mountpoint}"
-tried="/tmp/tried"
-
-# Create /etc/mtab for debug purpose and future syncs
-if [ ! -d /etc ]
-then
-       mkdir /etc/
-fi
-
-if [ ! -f /etc/mtab ]
-then
-       touch /etc/mtab
-fi
-
-if [ ! -x "/bin/fstype" ]
-then
-       # klibc not in path -> not in initramfs
-       export PATH="${PATH}:/usr/lib/klibc/bin"
-fi
-
-# handle upgrade path from old udev (using udevinfo) to
-# recent versions of udev (using udevadm info)
-if [ -x /sbin/udevadm ]
-then
-       udevinfo='/sbin/udevadm info'
-else
-       udevinfo='udevinfo'
-fi
-
-old_root_overlay_label="live-rw"
-old_home_overlay_label="home-rw"
-custom_overlay_label="persistence"
-persistence_list="live-persistence.conf"
-
-if [ ! -f /live.vars ]
-then
-       touch /live.vars
-fi
diff --git a/scripts/boot/0010-dracut b/scripts/boot/0010-dracut
new file mode 100755 (executable)
index 0000000..19db182
--- /dev/null
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+#set -e
+
+DRACUT_FIXME ()
+{
+       # dracut entry point for live-boot is FIXME(); function
+       Main
+}
diff --git a/scripts/boot/0020-initramfs-tools b/scripts/boot/0020-initramfs-tools
new file mode 100755 (executable)
index 0000000..175488e
--- /dev/null
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+#set -e
+
+mountroot ()
+{
+       # initramfs-tools entry point for live-boot is mountroot(); function
+       Main
+}
diff --git a/scripts/boot/0110-cmdline b/scripts/boot/0110-cmdline
new file mode 100755 (executable)
index 0000000..aa12286
--- /dev/null
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+#set -e
+
+Cmdline ()
+{
+       for _PARAMETER in ${_CMDLINE}
+       do
+               case "${_PARAMETER}" in
+                       live-boot.read-only|read-only)
+                               LIVE_READ_ONLY="true"
+                               ;;
+
+                       live-boot.swapon=*|swapon=*)
+                               LIVE_SWAPON="true"
+                               LIVE_SWAPON_DEVICES="${_PARAMETER#*swapon=}"
+                               ;;
+
+                       live-boot.swapon|swapon)
+                               LIVE_SWAPON="true"
+                               ;;
+
+                       live-boot.verify-checksums|verify-checksums)
+                               LIVE_VERIFY_CHECKSUMS="true"
+                               ;;
+
+                       # Special options
+                       live-boot.debug|debug)
+                               LIVE_DEBUG="true"
+                               ;;
+               esac
+       done
+}
similarity index 88%
rename from scripts/boot/read-only.sh
rename to scripts/boot/0120-read-only
index 48aa06c..588d57b 100755 (executable)
@@ -15,7 +15,7 @@ Read_only ()
                        continue
                fi
 
-               echo -n "Setting ${_DEVICE} read-only..." > /dev/console
+               echo -n "live-boot: Setting ${_DEVICE} read-only..." > /dev/console
 
                blockdev --setro ${_DEVICE}
                _RETURN="${?}"
similarity index 77%
rename from scripts/boot/swapon.sh
rename to scripts/boot/3020-swapon
index 158d81b..281fd04 100755 (executable)
@@ -4,7 +4,12 @@
 
 Swapon ()
 {
-       _DEVICES="/dev/sd* /dev/vd*"
+       if [ "${LIVE_SWAPON}" != "true" ]
+       then
+               return 0
+       fi
+
+       LIVE_SWAPON_DEVICES="${LIVE_SWAPON_DEVICES:-/dev/sd* /dev/vd*}"
 
        if [ -e /run ]
        then
@@ -15,7 +20,7 @@ Swapon ()
                _FSTAB="/root/etc/fstab"
        fi
 
-       for _DEVICE in ${_DEVICES}
+       for _DEVICE in $(echo ${LIVE_SWAPON_DEVICES} | sed -e 's|,| |g')
        do
                if [ ! -b "${_DEVICE}" ]
                then
@@ -41,7 +46,7 @@ Swapon ()
        fi
 
        # Add new swap entries
-       for _DEVICE in _SWAP_DEVICES
+       for _DEVICE in ${_SWAP_DEVICES}
        do
                echo "${_DEVICE} swap swap defaults 0 0" >> "${_FSTAB}"
        done
diff --git a/scripts/boot/9990-aaa-fixme.sh b/scripts/boot/9990-aaa-fixme.sh
new file mode 100755 (executable)
index 0000000..77a291a
--- /dev/null
@@ -0,0 +1,57 @@
+#!/bin/sh
+
+if [ -e /scripts/functions ]
+then
+       # initramfs-tools specific (FIXME)
+       . /scripts/functions
+fi
+
+export PATH="/root/usr/bin:/root/usr/sbin:/root/bin:/root/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
+
+echo "/root/lib" >> /etc/ld.so.conf
+echo "/root/usr/lib" >> /etc/ld.so.conf
+
+mountpoint="/live/image"
+alt_mountpoint="/media"
+LIVE_MEDIA_PATH="live"
+
+HOSTNAME="host"
+
+mkdir -p "${mountpoint}"
+tried="/tmp/tried"
+
+# Create /etc/mtab for debug purpose and future syncs
+if [ ! -d /etc ]
+then
+       mkdir /etc/
+fi
+
+if [ ! -f /etc/mtab ]
+then
+       touch /etc/mtab
+fi
+
+if [ ! -x "/bin/fstype" ]
+then
+       # klibc not in path -> not in initramfs
+       export PATH="${PATH}:/usr/lib/klibc/bin"
+fi
+
+# handle upgrade path from old udev (using udevinfo) to
+# recent versions of udev (using udevadm info)
+if [ -x /sbin/udevadm ]
+then
+       udevinfo='/sbin/udevadm info'
+else
+       udevinfo='udevinfo'
+fi
+
+old_root_overlay_label="live-rw"
+old_home_overlay_label="home-rw"
+custom_overlay_label="persistence"
+persistence_list="live-persistence.conf"
+
+if [ ! -f /live.vars ]
+then
+       touch /live.vars
+fi
similarity index 94%
rename from scripts/boot/cmdline.sh
rename to scripts/boot/9990-cmdline-old
index a3781da..7a6ce43 100755 (executable)
@@ -2,30 +2,11 @@
 
 #set -e
 
-Cmdline ()
+Cmdline_old ()
 {
        for _PARAMETER in ${_CMDLINE}
        do
                case "${_PARAMETER}" in
-                       live-boot.read-only|read-only)
-                               LIVE_READ_ONLY="true"
-                               ;;
-
-                       live-boot.swapon)
-                               LIVE_SWAPON="true"
-                               ;;
-
-                       live-boot.verify-checksums|verify-checksums)
-                               LIVE_VERIFY_CHECKSUMS="true"
-                               ;;
-
-                       # Special options
-                       live-boot.debug|debug)
-                               LIVE_DEBUG="true"
-                               ;;
-
-
-                       # parameters below need review (FIXME)
                        skipconfig)
                                NOFSTAB="true"
                                NONETWORKING="true"
similarity index 99%
rename from scripts/boot/mountroot.sh
rename to scripts/boot/9990-main.sh
index 2d14e4d..3ad6a72 100755 (executable)
@@ -2,7 +2,7 @@
 
 # set -e
 
-mountroot ()
+Main ()
 {
        if [ -x /scripts/local-top/cryptroot ]
        then
@@ -20,6 +20,7 @@ mountroot ()
 
        _CMDLINE="$(cat /proc/cmdline)"
        Cmdline
+       Cmdline_old
 
        case "${LIVE_DEBUG}" in
                true)
diff --git a/scripts/boot/README b/scripts/boot/README
new file mode 100644 (file)
index 0000000..9ebce20
--- /dev/null
@@ -0,0 +1,11 @@
+scripts overview
+
+00xx   initramfs "bootstrapping"
+
+0xxx   live-boot internals
+
+1xxx   find and mount rootfs
+
+2xxx   find and mount persistence
+
+3xxx   anything after that involves read or write access to the rootfs