From 3b0def1c54e6cd384d1514b26fbf28b091638808 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 19 Jul 2012 00:01:27 +0200 Subject: [PATCH] Adding upstream version 3.0~a36. --- VERSION | 2 +- manpages/de/live-boot.de.7 | 2 +- manpages/de/live-persistence.conf.de.5 | 2 +- manpages/en/live-boot.7 | 2 +- manpages/en/live-persistence.conf.5 | 2 +- manpages/es/live-boot.es.7 | 2 +- manpages/es/live-persistence.conf.es.5 | 2 +- manpages/po/de/live-boot.7.po | 8 +-- manpages/po/de/live-persistence.conf.5.po | 8 +-- manpages/po/es/live-boot.7.po | 10 ++-- manpages/po/es/live-persistence.conf.5.po | 10 ++-- manpages/pot/live-boot.7.pot | 6 +-- manpages/pot/live-persistence.conf.5.pot | 6 +-- scripts/boot.sh | 58 +--------------------- scripts/boot/0010-dracut | 9 ++++ scripts/boot/0020-initramfs-tools | 9 ++++ scripts/boot/0110-cmdline | 33 ++++++++++++ scripts/boot/{read-only.sh => 0120-read-only} | 2 +- .../{verify-checksums.sh => 3010-verify-checksums} | 0 scripts/boot/{swapon.sh => 3020-swapon} | 11 ++-- scripts/boot/9990-aaa-fixme.sh | 57 +++++++++++++++++++++ scripts/boot/{cmdline.sh => 9990-cmdline-old} | 21 +------- scripts/boot/{fstab.sh => 9990-fstab.sh} | 0 ...{initramfs-tools.sh => 9990-initramfs-tools.sh} | 0 scripts/boot/{mountroot.sh => 9990-main.sh} | 3 +- .../boot/{misc-helpers.sh => 9990-misc-helpers.sh} | 0 scripts/boot/{mount-cifs.sh => 9990-mount-cifs.sh} | 0 scripts/boot/{mount-http.sh => 9990-mount-http.sh} | 0 .../boot/{mount-iscsi.sh => 9990-mount-iscsi.sh} | 0 scripts/boot/{mount-nfs.sh => 9990-mount-nfs.sh} | 0 scripts/boot/{netbase.sh => 9990-netbase.sh} | 0 scripts/boot/{netboot.sh => 9990-netboot.sh} | 0 scripts/boot/{networking.sh => 9990-networking.sh} | 0 scripts/boot/{overlay.sh => 9990-overlay.sh} | 0 ...ect-eth-device.sh => 9990-select-eth-device.sh} | 0 .../boot/{toram-todisk.sh => 9990-toram-todisk.sh} | 0 scripts/boot/README | 11 ++++ 37 files changed, 163 insertions(+), 113 deletions(-) create mode 100755 scripts/boot/0010-dracut create mode 100755 scripts/boot/0020-initramfs-tools create mode 100755 scripts/boot/0110-cmdline rename scripts/boot/{read-only.sh => 0120-read-only} (88%) rename scripts/boot/{verify-checksums.sh => 3010-verify-checksums} (100%) rename scripts/boot/{swapon.sh => 3020-swapon} (77%) create mode 100755 scripts/boot/9990-aaa-fixme.sh rename scripts/boot/{cmdline.sh => 9990-cmdline-old} (94%) rename scripts/boot/{fstab.sh => 9990-fstab.sh} (100%) rename scripts/boot/{initramfs-tools.sh => 9990-initramfs-tools.sh} (100%) rename scripts/boot/{mountroot.sh => 9990-main.sh} (99%) rename scripts/boot/{misc-helpers.sh => 9990-misc-helpers.sh} (100%) rename scripts/boot/{mount-cifs.sh => 9990-mount-cifs.sh} (100%) rename scripts/boot/{mount-http.sh => 9990-mount-http.sh} (100%) rename scripts/boot/{mount-iscsi.sh => 9990-mount-iscsi.sh} (100%) rename scripts/boot/{mount-nfs.sh => 9990-mount-nfs.sh} (100%) rename scripts/boot/{netbase.sh => 9990-netbase.sh} (100%) rename scripts/boot/{netboot.sh => 9990-netboot.sh} (100%) rename scripts/boot/{networking.sh => 9990-networking.sh} (100%) rename scripts/boot/{overlay.sh => 9990-overlay.sh} (100%) rename scripts/boot/{select-eth-device.sh => 9990-select-eth-device.sh} (100%) rename scripts/boot/{toram-todisk.sh => 9990-toram-todisk.sh} (100%) create mode 100644 scripts/boot/README diff --git a/VERSION b/VERSION index c915247..6b82b43 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0~a35-1 +3.0~a36-1 diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7 index c9ac3f1..4fee838 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 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 diff --git a/manpages/de/live-persistence.conf.de.5 b/manpages/de/live-persistence.conf.de.5 index 0070ce1..9bdf6b5 100644 --- a/manpages/de/live-persistence.conf.de.5 +++ b/manpages/de/live-persistence.conf.de.5 @@ -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 diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7 index 5badb72..36f222c 100644 --- a/manpages/en/live-boot.7 +++ b/manpages/en/live-boot.7 @@ -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 diff --git a/manpages/en/live-persistence.conf.5 b/manpages/en/live-persistence.conf.5 index 8d019f1..924683f 100644 --- a/manpages/en/live-persistence.conf.5 +++ b/manpages/en/live-persistence.conf.5 @@ -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 diff --git a/manpages/es/live-boot.es.7 b/manpages/es/live-boot.es.7 index 88f4055..f23a4a7 100644 --- a/manpages/es/live-boot.es.7 +++ b/manpages/es/live-boot.es.7 @@ -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 diff --git a/manpages/es/live-persistence.conf.es.5 b/manpages/es/live-persistence.conf.es.5 index cc0e8d1..3952eea 100644 --- a/manpages/es/live-persistence.conf.es.5 +++ b/manpages/es/live-persistence.conf.es.5 @@ -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 diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po index 9d27fa1..a2777d8 100644 --- a/manpages/po/de/live-boot.7.po +++ b/manpages/po/de/live-boot.7.po @@ -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 \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 diff --git a/manpages/po/de/live-persistence.conf.5.po b/manpages/po/de/live-persistence.conf.5.po index 9546483..d2676e6 100644 --- a/manpages/po/de/live-persistence.conf.5.po +++ b/manpages/po/de/live-persistence.conf.5.po @@ -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 \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 diff --git a/manpages/po/es/live-boot.7.po b/manpages/po/es/live-boot.7.po index d0e52dc..01c9c12 100644 --- a/manpages/po/es/live-boot.7.po +++ b/manpages/po/es/live-boot.7.po @@ -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» \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 diff --git a/manpages/po/es/live-persistence.conf.5.po b/manpages/po/es/live-persistence.conf.5.po index c5438f8..86d9aad 100644 --- a/manpages/po/es/live-persistence.conf.5.po +++ b/manpages/po/es/live-persistence.conf.5.po @@ -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» \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 diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot index bd226fd..d18a75b 100644 --- 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: 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 \n" "Language-Team: LANGUAGE \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 diff --git a/manpages/pot/live-persistence.conf.5.pot b/manpages/pot/live-persistence.conf.5.pot index 21032ec..e1e8fa5 100644 --- a/manpages/pot/live-persistence.conf.5.pot +++ b/manpages/pot/live-persistence.conf.5.pot @@ -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 \n" "Language-Team: LANGUAGE \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 diff --git a/scripts/boot.sh b/scripts/boot.sh index 9539496..c031f00 100755 --- a/scripts/boot.sh +++ b/scripts/boot.sh @@ -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 index 0000000..19db182 --- /dev/null +++ b/scripts/boot/0010-dracut @@ -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 index 0000000..175488e --- /dev/null +++ b/scripts/boot/0020-initramfs-tools @@ -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 index 0000000..aa12286 --- /dev/null +++ b/scripts/boot/0110-cmdline @@ -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 +} diff --git a/scripts/boot/read-only.sh b/scripts/boot/0120-read-only similarity index 88% rename from scripts/boot/read-only.sh rename to scripts/boot/0120-read-only index 48aa06c..588d57b 100755 --- a/scripts/boot/read-only.sh +++ b/scripts/boot/0120-read-only @@ -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="${?}" diff --git a/scripts/boot/verify-checksums.sh b/scripts/boot/3010-verify-checksums similarity index 100% rename from scripts/boot/verify-checksums.sh rename to scripts/boot/3010-verify-checksums diff --git a/scripts/boot/swapon.sh b/scripts/boot/3020-swapon similarity index 77% rename from scripts/boot/swapon.sh rename to scripts/boot/3020-swapon index 158d81b..281fd04 100755 --- a/scripts/boot/swapon.sh +++ b/scripts/boot/3020-swapon @@ -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 index 0000000..77a291a --- /dev/null +++ b/scripts/boot/9990-aaa-fixme.sh @@ -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 diff --git a/scripts/boot/cmdline.sh b/scripts/boot/9990-cmdline-old similarity index 94% rename from scripts/boot/cmdline.sh rename to scripts/boot/9990-cmdline-old index a3781da..7a6ce43 100755 --- a/scripts/boot/cmdline.sh +++ b/scripts/boot/9990-cmdline-old @@ -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" diff --git a/scripts/boot/fstab.sh b/scripts/boot/9990-fstab.sh similarity index 100% rename from scripts/boot/fstab.sh rename to scripts/boot/9990-fstab.sh diff --git a/scripts/boot/initramfs-tools.sh b/scripts/boot/9990-initramfs-tools.sh similarity index 100% rename from scripts/boot/initramfs-tools.sh rename to scripts/boot/9990-initramfs-tools.sh diff --git a/scripts/boot/mountroot.sh b/scripts/boot/9990-main.sh similarity index 99% rename from scripts/boot/mountroot.sh rename to scripts/boot/9990-main.sh index 2d14e4d..3ad6a72 100755 --- a/scripts/boot/mountroot.sh +++ b/scripts/boot/9990-main.sh @@ -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/misc-helpers.sh b/scripts/boot/9990-misc-helpers.sh similarity index 100% rename from scripts/boot/misc-helpers.sh rename to scripts/boot/9990-misc-helpers.sh diff --git a/scripts/boot/mount-cifs.sh b/scripts/boot/9990-mount-cifs.sh similarity index 100% rename from scripts/boot/mount-cifs.sh rename to scripts/boot/9990-mount-cifs.sh diff --git a/scripts/boot/mount-http.sh b/scripts/boot/9990-mount-http.sh similarity index 100% rename from scripts/boot/mount-http.sh rename to scripts/boot/9990-mount-http.sh diff --git a/scripts/boot/mount-iscsi.sh b/scripts/boot/9990-mount-iscsi.sh similarity index 100% rename from scripts/boot/mount-iscsi.sh rename to scripts/boot/9990-mount-iscsi.sh diff --git a/scripts/boot/mount-nfs.sh b/scripts/boot/9990-mount-nfs.sh similarity index 100% rename from scripts/boot/mount-nfs.sh rename to scripts/boot/9990-mount-nfs.sh diff --git a/scripts/boot/netbase.sh b/scripts/boot/9990-netbase.sh similarity index 100% rename from scripts/boot/netbase.sh rename to scripts/boot/9990-netbase.sh diff --git a/scripts/boot/netboot.sh b/scripts/boot/9990-netboot.sh similarity index 100% rename from scripts/boot/netboot.sh rename to scripts/boot/9990-netboot.sh diff --git a/scripts/boot/networking.sh b/scripts/boot/9990-networking.sh similarity index 100% rename from scripts/boot/networking.sh rename to scripts/boot/9990-networking.sh diff --git a/scripts/boot/overlay.sh b/scripts/boot/9990-overlay.sh similarity index 100% rename from scripts/boot/overlay.sh rename to scripts/boot/9990-overlay.sh diff --git a/scripts/boot/select-eth-device.sh b/scripts/boot/9990-select-eth-device.sh similarity index 100% rename from scripts/boot/select-eth-device.sh rename to scripts/boot/9990-select-eth-device.sh diff --git a/scripts/boot/toram-todisk.sh b/scripts/boot/9990-toram-todisk.sh similarity index 100% rename from scripts/boot/toram-todisk.sh rename to scripts/boot/9990-toram-todisk.sh diff --git a/scripts/boot/README b/scripts/boot/README new file mode 100644 index 0000000..9ebce20 --- /dev/null +++ b/scripts/boot/README @@ -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 -- 2.1.4