From 3b9aa28dd04d694d49a07cf4d13fc8c704891f5b Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 13 Sep 2013 14:18:38 +0200 Subject: [PATCH] Adding upstream version 4.0~a14. --- Makefile | 18 +-- VERSION | 2 +- {backends => backend}/dracut/live.script | 2 +- {backends => backend}/initramfs-tools/live.hook | 23 ++-- {backends => backend}/initramfs-tools/live.script | 2 +- {scripts/boot => components}/0010-debug | 6 +- {scripts/boot => components}/0020-read-only | 2 +- {scripts/boot => components}/0030-verify-checksums | 4 +- {scripts/boot => components}/3020-swapon | 2 +- components/9990-aaa-fixme.sh | 30 +++++ {scripts/boot => components}/9990-cmdline-old | 2 +- {scripts/boot => components}/9990-fstab.sh | 0 .../boot => components}/9990-initramfs-tools.sh | 0 {scripts/boot => components}/9990-main.sh | 4 +- {scripts/boot => components}/9990-misc-helpers.sh | 134 ++++++++++++++------- {scripts/boot => components}/9990-mount-cifs.sh | 0 {scripts/boot => components}/9990-mount-http.sh | 0 {scripts/boot => components}/9990-mount-iscsi.sh | 2 +- {scripts/boot => components}/9990-mount-nfs.sh | 0 {scripts/boot => components}/9990-netbase.sh | 25 ++-- {scripts/boot => components}/9990-netboot.sh | 0 {scripts/boot => components}/9990-networking.sh | 73 ++++++----- {scripts/boot => components}/9990-overlay.sh | 2 +- .../boot => components}/9990-select-eth-device.sh | 4 +- {scripts/boot => components}/9990-toram-todisk.sh | 2 +- scripts/boot.sh => frontend/live-boot | 6 +- {bin => frontend}/live-swapfile | 0 manpages/bin/update-version.sh | 2 +- manpages/de/live-boot.de.7 | 9 +- manpages/de/persistence.conf.de.5 | 2 +- manpages/en/live-boot.7 | 8 +- manpages/en/persistence.conf.5 | 2 +- manpages/es/live-boot.es.7 | 12 +- manpages/es/persistence.conf.es.5 | 2 +- manpages/po/de/live-boot.7.po | 22 ++-- manpages/po/de/persistence.conf.5.po | 14 ++- manpages/po/es/live-boot.7.po | 33 ++--- manpages/po/es/persistence.conf.5.po | 14 ++- manpages/pot/live-boot.7.pot | 14 +-- manpages/pot/persistence.conf.5.pot | 6 +- scripts/boot/9990-aaa-fixme.sh | 50 -------- scripts/boot/FIXME | 28 ----- 42 files changed, 285 insertions(+), 278 deletions(-) rename {backends => backend}/dracut/live.script (83%) rename {backends => backend}/initramfs-tools/live.hook (89%) rename {backends => backend}/initramfs-tools/live.script (87%) rename {scripts/boot => components}/0010-debug (66%) rename {scripts/boot => components}/0020-read-only (96%) rename {scripts/boot => components}/0030-verify-checksums (95%) rename {scripts/boot => components}/3020-swapon (96%) create mode 100755 components/9990-aaa-fixme.sh rename {scripts/boot => components}/9990-cmdline-old (99%) rename {scripts/boot => components}/9990-fstab.sh (100%) rename {scripts/boot => components}/9990-initramfs-tools.sh (100%) rename {scripts/boot => components}/9990-main.sh (98%) rename {scripts/boot => components}/9990-misc-helpers.sh (92%) rename {scripts/boot => components}/9990-mount-cifs.sh (100%) rename {scripts/boot => components}/9990-mount-http.sh (100%) rename {scripts/boot => components}/9990-mount-iscsi.sh (96%) rename {scripts/boot => components}/9990-mount-nfs.sh (100%) rename {scripts/boot => components}/9990-netbase.sh (86%) rename {scripts/boot => components}/9990-netboot.sh (100%) rename {scripts/boot => components}/9990-networking.sh (77%) rename {scripts/boot => components}/9990-overlay.sh (99%) rename {scripts/boot => components}/9990-select-eth-device.sh (96%) rename {scripts/boot => components}/9990-toram-todisk.sh (97%) rename scripts/boot.sh => frontend/live-boot (71%) rename {bin => frontend}/live-swapfile (100%) delete mode 100755 scripts/boot/9990-aaa-fixme.sh delete mode 100644 scripts/boot/FIXME diff --git a/Makefile b/Makefile index d083027..8a78928 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ SHELL := sh -e LANGUAGES = $(shell cd manpages/po && ls) -SCRIPTS = backends/*/* bin/* scripts/*.sh scripts/*/*-* +SCRIPTS = backend/*/* frontend/* components/* all: build @@ -41,15 +41,18 @@ build: @echo "Nothing to build." install: - # Installing scripts + # Installing components mkdir -p $(DESTDIR)/lib/live - cp -r scripts/boot.sh scripts/boot $(DESTDIR)/lib/live + cp components/* $(DESTDIR)/lib/live # Installing executables mkdir -p $(DESTDIR)/usr/share/initramfs-tools/hooks - cp backends/initramfs-tools/live.hook $(DESTDIR)/usr/share/initramfs-tools/hooks/live + cp backend/initramfs-tools/live.hook $(DESTDIR)/usr/share/initramfs-tools/hooks/live mkdir -p $(DESTDIR)/usr/share/initramfs-tools/scripts - cp backends/initramfs-tools/live.script $(DESTDIR)/usr/share/initramfs-tools/scripts/live + cp backend/initramfs-tools/live.script $(DESTDIR)/usr/share/initramfs-tools/scripts/live + + mkdir -p $(DESTDIR)/bin + cp frontend/* $(DESTDIR)/bin # Installing docs mkdir -p $(DESTDIR)/usr/share/doc/live-boot @@ -73,8 +76,9 @@ install: uninstall: # Uninstalling executables - rm -f $(DESTDIR)/sbin/live-swapfile - rmdir --ignore-fail-on-non-empty $(DESTDIR)/sbin > /dev/null 2>&1 || true + rm -f $(DESTDIR)/bin/live-boot + rm -f $(DESTDIR)/bin/live-swapfile + rmdir --ignore-fail-on-non-empty $(DESTDIR)/bin > /dev/null 2>&1 || true rm -f $(DESTDIR)/usr/share/initramfs-tools/hooks/live rm -f $(DESTDIR)/usr/share/initramfs-tools/scripts/live diff --git a/VERSION b/VERSION index 18c92c9..f162363 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.0~a13-1 +4.0~a14-1 diff --git a/backends/dracut/live.script b/backend/dracut/live.script similarity index 83% rename from backends/dracut/live.script rename to backend/dracut/live.script index 223f355..0774bfb 100755 --- a/backends/dracut/live.script +++ b/backend/dracut/live.script @@ -2,7 +2,7 @@ #set -e -. /lib/live/boot.sh +. /bin/live-boot DRACUT_FIXME () { diff --git a/backends/initramfs-tools/live.hook b/backend/initramfs-tools/live.hook similarity index 89% rename from backends/initramfs-tools/live.hook rename to backend/initramfs-tools/live.hook index 1814211..76f4218 100755 --- a/backends/initramfs-tools/live.hook +++ b/backend/initramfs-tools/live.hook @@ -17,7 +17,7 @@ do done # Checking live-boot -if [ ! -e /lib/live/boot ] +if [ ! -e /bin/live-boot ] then echo echo "W: live-boot-initramfs-tools (backend) installed without live-boot," @@ -27,15 +27,18 @@ fi [ "${QUIET}" ] || echo -n " core" +mkdir -p "${DESTDIR}/bin" +cp -a /bin/live-boot /lib/live/boot "${DESTDIR}/bin" + mkdir -p "${DESTDIR}/lib/live" -cp -a /lib/live/boot.sh /lib/live/boot "${DESTDIR}/lib/live" +cp -a /lib/live/boot "${DESTDIR}/lib/live" # klibc dependencies for FILE in /lib/libacl* /lib/libblkid* /lib/libuuid* /lib/libdevmapper* /lib/libattr* do - if [ ! -e "${DESTDIR}"/"${FILE}" ] && ls ${FILE} > /dev/null 2>&1 + if [ ! -e "${DESTDIR}/${FILE}" ] && ls "${FILE}" > /dev/null 2>&1 then - cp -a "${FILE}" "${DESTDIR}"/"${FILE}" + cp -a "${FILE}" "${DESTDIR}/${FILE}" fi done @@ -47,8 +50,8 @@ done if [ -e /lib/udev/rules.d/60-cdrom_id.rules ] then - mkdir -p ${DESTDIR}/lib/udev/rules.d - cp -p /lib/udev/rules.d/60-cdrom_id.rules ${DESTDIR}/lib/udev/rules.d + mkdir -p "${DESTDIR}/lib/udev/rules.d" + cp -p /lib/udev/rules.d/60-cdrom_id.rules "${DESTDIR}/lib/udev/rules.d" fi [ "${QUIET}" ] || echo -n " filesystems" @@ -58,15 +61,15 @@ if [ -x /bin/loadkeys ] && [ -r /etc/console/boottime.kmap.gz ] then copy_exec /bin/loadkeys - mkdir -p "${DESTDIR}"/etc - cp /etc/console/boottime.kmap.gz "${DESTDIR}"/etc + mkdir -p "${DESTDIR}/etc" + cp /etc/console/boottime.kmap.gz "${DESTDIR}/etc" fi # Configuration: Unique ID if [ -n "${LIVE_GENERATE_UUID}" ] then - mkdir -p "${DESTDIR}"/conf - uuidgen -r > "${DESTDIR}"/conf/uuid.conf + mkdir -p "${DESTDIR}/conf" + uuidgen -r > "${DESTDIR}/conf/uuid.conf" fi # Filesystem: btrfs diff --git a/backends/initramfs-tools/live.script b/backend/initramfs-tools/live.script similarity index 87% rename from backends/initramfs-tools/live.script rename to backend/initramfs-tools/live.script index 9646274..ff2915a 100755 --- a/backends/initramfs-tools/live.script +++ b/backend/initramfs-tools/live.script @@ -2,7 +2,7 @@ #set -e -. /lib/live/boot.sh +. /bin/live-boot . /scripts/functions diff --git a/scripts/boot/0010-debug b/components/0010-debug similarity index 66% rename from scripts/boot/0010-debug rename to components/0010-debug index f223e93..cfb2fc8 100755 --- a/scripts/boot/0010-debug +++ b/components/0010-debug @@ -4,16 +4,16 @@ Debug () { - for _PARAMETER in ${_CMDLINE} + for _PARAMETER in ${LIVE_BOOT_CMDLINE} do case "${_PARAMETER}" in live-boot.debug|debug) - LIVE_DEBUG="true" + LIVE_BOOT_DEBUG="true" ;; esac done - case "${LIVE_DEBUG}" in + case "${LIVE_BOOT_DEBUG}" in true) ;; diff --git a/scripts/boot/0020-read-only b/components/0020-read-only similarity index 96% rename from scripts/boot/0020-read-only rename to components/0020-read-only index 859f771..fc0dde0 100755 --- a/scripts/boot/0020-read-only +++ b/components/0020-read-only @@ -4,7 +4,7 @@ Read_only () { - for _PARAMETER in ${_CMDLINE} + for _PARAMETER in ${LIVE_BOOT_CMDLINE} do case "${_PARAMETER}" in live-boot.read-only=*|read-only=*) diff --git a/scripts/boot/0030-verify-checksums b/components/0030-verify-checksums similarity index 95% rename from scripts/boot/0030-verify-checksums rename to components/0030-verify-checksums index 08b2972..dd1c8f8 100755 --- a/scripts/boot/0030-verify-checksums +++ b/components/0030-verify-checksums @@ -4,7 +4,7 @@ Verify_checksums () { - for _PARAMETER in ${_CMDLINE} + for _PARAMETER in ${LIVE_BOOT_CMDLINE} do case "${_PARAMETER}" in live-boot.verify-checksums=*|verify-checksums=*) @@ -72,7 +72,7 @@ Verify_checksums () # Unmount live-media cd / - umount -f ${_MOUNTPOINT} > /dev/null 2>&1 + umount -f "${_MOUNTPOINT}" > /dev/null 2>&1 sync # Attempt to remount all mounted filesystems read-only diff --git a/scripts/boot/3020-swapon b/components/3020-swapon similarity index 96% rename from scripts/boot/3020-swapon rename to components/3020-swapon index 3df90de..a1bcdbe 100755 --- a/scripts/boot/3020-swapon +++ b/components/3020-swapon @@ -4,7 +4,7 @@ Swap () { - for _PARAMETER in ${_CMDLINE} + for _PARAMETER in ${LIVE_BOOT_CMDLINE} do case "${_PARAMETER}" in live-boot.swap=*|swap=*) diff --git a/components/9990-aaa-fixme.sh b/components/9990-aaa-fixme.sh new file mode 100755 index 0000000..3309c81 --- /dev/null +++ b/components/9990-aaa-fixme.sh @@ -0,0 +1,30 @@ +#!/bin/sh + +PATH="/root/usr/bin:/root/usr/sbin:/root/bin:/root/sbin:/usr/bin:/usr/sbin:/bin:/sbin" +export PATH + +echo "/root/lib" >> /etc/ld.so.conf +echo "/root/usr/lib" >> /etc/ld.so.conf + +mountpoint="/live/medium" +alt_mountpoint="/media" +LIVE_MEDIA_PATH="live" + +HOSTNAME="host" + +mkdir -p "${mountpoint}" +mkdir -p /var/lib/live/boot + +# Create /etc/mtab for debug purpose and future syncs +mkdir -p /etc +touch /etc/mtab + +if [ ! -x "/bin/fstype" ] +then + # klibc not in path -> not in initramfs + PATH="${PATH}:/usr/lib/klibc/bin" + export PATH +fi + +custom_overlay_label="persistence" +persistence_list="persistence.conf" diff --git a/scripts/boot/9990-cmdline-old b/components/9990-cmdline-old similarity index 99% rename from scripts/boot/9990-cmdline-old rename to components/9990-cmdline-old index 18bb6c3..8bb8254 100755 --- a/scripts/boot/9990-cmdline-old +++ b/components/9990-cmdline-old @@ -4,7 +4,7 @@ Cmdline_old () { - for _PARAMETER in ${_CMDLINE} + for _PARAMETER in ${LIVE_BOOT_CMDLINE} do case "${_PARAMETER}" in skipconfig) diff --git a/scripts/boot/9990-fstab.sh b/components/9990-fstab.sh similarity index 100% rename from scripts/boot/9990-fstab.sh rename to components/9990-fstab.sh diff --git a/scripts/boot/9990-initramfs-tools.sh b/components/9990-initramfs-tools.sh similarity index 100% rename from scripts/boot/9990-initramfs-tools.sh rename to components/9990-initramfs-tools.sh diff --git a/scripts/boot/9990-main.sh b/components/9990-main.sh similarity index 98% rename from scripts/boot/9990-main.sh rename to components/9990-main.sh index 8776a7d..83f087f 100755 --- a/scripts/boot/9990-main.sh +++ b/components/9990-main.sh @@ -16,9 +16,7 @@ Live () tail -f boot.log >&7 & tailpid="${!}" - . /live.vars - - _CMDLINE="$(cat /proc/cmdline)" + LIVE_BOOT_CMDLINE="${LIVE_BOOT_CMDLINE:-$(cat /proc/cmdline)}" Cmdline_old Debug diff --git a/scripts/boot/9990-misc-helpers.sh b/components/9990-misc-helpers.sh similarity index 92% rename from scripts/boot/9990-misc-helpers.sh rename to components/9990-misc-helpers.sh index 5c5341c..2a3e6ad 100755 --- a/scripts/boot/9990-misc-helpers.sh +++ b/components/9990-misc-helpers.sh @@ -2,17 +2,12 @@ #set -e -file_pattern_matches() -{ - [ -e "$1" ] -} - is_live_path() { DIRECTORY="${1}/${LIVE_MEDIA_PATH}" for FILESYSTEM in squashfs ext2 ext3 ext4 xfs dir jffs do - if file_pattern_matches "${DIRECTORY}/"*.${FILESYSTEM} + if ls "${DIRECTORY}/"*.${FILESYSTEM} > /dev/null 2>&1 then return 0 fi @@ -81,7 +76,7 @@ is_nice_device () { sysfs_path="${1#/sys}" - if /sbin/udevadm test-builtin path_id "${sysfs_path}" | egrep -q "ID_PATH=(usb|pci-[^-]*-(ide|sas|scsi|usb|virtio)|platform-sata_mv|platform-orion-ehci|platform-mmc|platform-mxsdhci)" + if udevadm test-builtin path_id "${sysfs_path}" | egrep -q "ID_PATH=(usb|pci-[^-]*-(ide|sas|scsi|usb|virtio)|platform-sata_mv|platform-orion-ehci|platform-mmc|platform-mxsdhci)" then return 0 elif echo "${sysfs_path}" | grep -q '^/block/vd[a-z]$' @@ -199,9 +194,9 @@ check_dev () if is_supported_fs ${fstype} then devuid=$(blkid -o value -s UUID "$devname") - [ -n "$devuid" ] && grep -qs "\<$devuid\>" $tried && continue + [ -n "$devuid" ] && grep -qs "\<$devuid\>" /var/lib/live/boot/devices-already-tried-to-mount && continue mount -t ${fstype} -o ro,noatime "${devname}" ${mountpoint} || continue - [ -n "$devuid" ] && echo "$devuid" >> $tried + [ -n "$devuid" ] && echo "$devuid" >> /var/lib/live/boot/devices-already-tried-to-mount if [ -n "${FINDISO}" ] then @@ -334,21 +329,6 @@ find_livefs () return 1 } -really_export () -{ - STRING="${1}" - VALUE="$(eval echo -n \${$STRING})" - - if [ -f /live.vars ] && grep -sq "export ${STRING}" /live.vars - then - sed -i -e 's/\('${STRING}'=\).*$/\1'${VALUE}'/' /live.vars - else - echo "export ${STRING}=\"${VALUE}\"" >> /live.vars - fi - - eval export "${STRING}"="${VALUE}" -} - is_in_list_separator_helper () { local sep element list @@ -379,7 +359,7 @@ is_in_comma_sep_list () sys2dev () { sysdev=${1#/sys} - echo "/dev/$($udevinfo -q name -p ${sysdev} 2>/dev/null|| echo ${sysdev##*/})" + echo "/dev/$(udevadm info -q name -p ${sysdev} 2>/dev/null|| echo ${sysdev##*/})" } subdevices () @@ -704,8 +684,9 @@ try_mount () } # Try to mount $device to the place expected by live-boot. If $device -# is already mounted somewhere, move it to the expected place. If -# we're only probing $device (to check if it has custom persistence) +# is already mounted somewhere, move it to the expected place. If $device +# ends with a "/" this is a directory path. +# If we're only probing $device (to check if it has custom persistence) # $probe should be set, which suppresses warnings upon failure. On # success, print the mount point for $device. mount_persistence_media () @@ -714,6 +695,20 @@ mount_persistence_media () device=${1} probe=${2} + # get_custom_mounts() might call this with a directory path instead + # of a block device path. This means we have found sub-directory path + # underneath /lib/live/mounts/persistence, so we're done + if [ -d "${device}" ] + then + echo "${device}" + return 0 + fi + + if [ ! -b "${device}" ] + then + return 1 + fi + backing="/live/persistence/$(basename ${device})" mkdir -p "${backing}" @@ -737,15 +732,24 @@ mount_persistence_media () fi elif [ "${backing}" != "${old_backing}" ] then - if mount --move ${old_backing} ${backing} >/dev/null + if ! mount --move ${old_backing} ${backing} >/dev/null then - echo ${backing} - return 0 - else [ -z "${probe}" ] && log_warning_msg "Failed to move persistence media ${device}" rmdir "${backing}" return 1 fi + mount_opts="rw,noatime" + if [ -n "${PERSISTENCE_READONLY}" ] + then + mount_opts="ro,noatime" + fi + if ! mount -o "remount,${mount_opts}" "${backing}" >/dev/null + then + log_warning_msg "Failed to remount persistence media ${device} writable" + # Don't unmount or rmdir the new mountpoint in this case + fi + echo ${backing} + return 0 else # This means that $device has already been mounted on # the place expected by live-boot, so we're done. @@ -895,7 +899,7 @@ probe_for_file_name () for label in ${overlays} do - path=${backing}/${PERSISTENCE_PATH}${label} + path=${backing}/${PERSISTENCE_PATH}/${label} if [ -f "${path}" ] then local loopdev @@ -914,6 +918,39 @@ probe_for_file_name () fi } +probe_for_directory_name () +{ + local overlays dev ret backing + overlays="${1}" + dev="${2}" + + ret="" + backing="$(mount_persistence_media ${dev} probe)" + if [ -z "${backing}" ] + then + return + fi + + for label in ${overlays} + do + path=${backing}/${PERSISTENCE_PATH}/${label} + if [ -d "${path}" ] + then + # in this case the "device" ends with a "/" + ret="${ret} ${label}=${backing}/${PERSISTENCE_PATH}/${label%%/}/" + fi + done + + if [ -n "${ret}" ] + then + echo ${ret} + else + # unmount and remove mountpoint + umount ${backing} > /dev/null 2>&1 || true + rmdir ${backing} > /dev/null 2>&1 || true + fi +} + find_persistence_media () { # Scans devices for overlays, and returns a whitespace @@ -938,7 +975,17 @@ find_persistence_media () white_listed_devices="${2}" ret="" - black_listed_devices="$(what_is_mounted_on /live/medium) $(what_is_mounted_on /live/findiso) $(what_is_mounted_on /live/fromiso)" + # + # The devices that are hosting the actual live rootfs should not be + # used for persistence storage since otherwise you might mount a + # parent directory on top of a sub-directory of the same filesystem + # in one union together. + # + black_listed_devices="" + for d in /live/rootfs/* /live/findiso /live/fromiso + do + black_listed_devices="${black_listed_devices} $(what_is_mounted_on d)" + done for dev in $(storage_devices "${black_listed_devices}" "${white_listed_devices}") do @@ -1009,6 +1056,17 @@ find_persistence_media () fi fi + # Probe for directory with matching name on mounted partition + if is_in_comma_sep_list directory ${PERSISTENCE_STORAGE} + then + result=$(probe_for_directory_name "${overlays}" ${dev}) + if [ -n "${result}" ] + then + ret="${ret} ${result}" + continue + fi + fi + # Close luks device if it isn't used if [ -z "${result}" ] && [ -n "${luks_device}" ] && is_active_luks_mapping "${luks_device}" then @@ -1270,11 +1328,6 @@ get_custom_mounts () for device in ${devices} do - if [ ! -b "${device}" ] - then - continue - fi - local device_name backing include_list device_name="$(basename ${device})" backing=$(mount_persistence_media ${device}) @@ -1286,14 +1339,11 @@ get_custom_mounts () if [ -r "${backing}/${persistence_list}" ] then include_list="${backing}/${persistence_list}" - elif [ -r "${backing}/${old_persistence_list}" ] - then - include_list="${backing}/${old_persistence_list}" else continue fi - if [ -n "${DEBUG}" ] && [ -e "${include_list}" ] + if [ -n "${LIVE_BOOT_DEBUG}" ] && [ -e "${include_list}" ] then cp ${include_list} /live/persistence/${persistence_list}.${device_name} fi diff --git a/scripts/boot/9990-mount-cifs.sh b/components/9990-mount-cifs.sh similarity index 100% rename from scripts/boot/9990-mount-cifs.sh rename to components/9990-mount-cifs.sh diff --git a/scripts/boot/9990-mount-http.sh b/components/9990-mount-http.sh similarity index 100% rename from scripts/boot/9990-mount-http.sh rename to components/9990-mount-http.sh diff --git a/scripts/boot/9990-mount-iscsi.sh b/components/9990-mount-iscsi.sh similarity index 96% rename from scripts/boot/9990-mount-iscsi.sh rename to components/9990-mount-iscsi.sh index 6ce9851..c9bab90 100755 --- a/scripts/boot/9990-mount-iscsi.sh +++ b/components/9990-mount-iscsi.sh @@ -9,7 +9,7 @@ do_iscsi() modprobe iscsi_tcp local debugopt debugopt="" - [ "${DEBUG}" = "true" ] && debugopt="-d 8" + [ "${LIVE_BOOT_DEBUG}" = "true" ] && debugopt="-d 8" #FIXME this name is supposed to be unique - some date + ifconfig hash? ISCSI_INITIATORNAME="iqn.1993-08.org.debian.live:01:$(echo "${HWADDR}" | sed -e s/://g)" export ISCSI_INITIATORNAME diff --git a/scripts/boot/9990-mount-nfs.sh b/components/9990-mount-nfs.sh similarity index 100% rename from scripts/boot/9990-mount-nfs.sh rename to components/9990-mount-nfs.sh diff --git a/scripts/boot/9990-netbase.sh b/components/9990-netbase.sh similarity index 86% rename from scripts/boot/9990-netbase.sh rename to components/9990-netbase.sh index b3f886c..496c3ff 100755 --- a/scripts/boot/9990-netbase.sh +++ b/components/9990-netbase.sh @@ -109,27 +109,22 @@ EOF # create a resolv.conf if it is not present or empty cp /netboot.config /root/var/log/netboot.config - rc_search=$(cat netboot.config | awk '/domain/{print $3}') - rc_server0=$(cat netboot.config | awk '/dns0/{print $5}') - rc_server1=$(cat netboot.config | awk '/dns0/{print $8}') - rc_server0="nameserver ${rc_server0}" - - if [ "${rc_server1}" = "0.0.0.0" ] - then - rc_server1="" - else - rc_server1="nameserver ${rc_server1}" - fi + rc_search=$(cat netboot.config | awk '/domain/ { print $3 }') + rc_server0="$(cat netboot.config | awk '/dns0/ { print $5 }')" cat > /root/etc/resolv.conf << EOF -# /etc/resolv.conf -# Autogenerated by live-boot search ${rc_search} domain ${rc_search} -${rc_server0} -${rc_server1} +nameserver ${rc_server0} EOF + rc_server1=$(cat netboot.config | awk '/dns0/ { print $8 }') + + if [ "${rc_server1}" ! = "0.0.0.0" ] + then + echo "nameserver ${rc_server1}" >> /root/etc/resolv.conf + fi + cat /root/etc/resolv.conf >> /root/var/log/netboot.config fi fi diff --git a/scripts/boot/9990-netboot.sh b/components/9990-netboot.sh similarity index 100% rename from scripts/boot/9990-netboot.sh rename to components/9990-netboot.sh diff --git a/scripts/boot/9990-networking.sh b/components/9990-networking.sh similarity index 77% rename from scripts/boot/9990-networking.sh rename to components/9990-networking.sh index cdec92a..dbdc913 100755 --- a/scripts/boot/9990-networking.sh +++ b/components/9990-networking.sh @@ -9,48 +9,47 @@ Device_from_bootif () if [ -n "${BOOTIF}" ] then - # pxelinux sets BOOTIF to a value based on the mac address of the - # network card used to PXE boot, so use this value for DEVICE rather - # than a hard-coded device name from initramfs.conf. this facilitates - # network booting when machines may have multiple network cards. - # pxelinux sets BOOTIF to 01-$mac_address - - # strip off the leading "01-", which isn't part of the mac - # address - temp_mac=${BOOTIF#*-} - - # convert to typical mac address format by replacing "-" with ":" - bootif_mac="" - IFS='-' - for x in $temp_mac - do - if [ -z "$bootif_mac" ] - then - bootif_mac="$x" - else - bootif_mac="$bootif_mac:$x" - fi - done - unset IFS - - # look for devices with matching mac address, and set DEVICE to - # appropriate value if match is found. + # pxelinux sets BOOTIF to a value based on the mac address of the + # network card used to PXE boot, so use this value for DEVICE rather + # than a hard-coded device name from initramfs.conf. this facilitates + # network booting when machines may have multiple network cards. + # pxelinux sets BOOTIF to 01-$mac_address + + # strip off the leading "01-", which isn't part of the mac + # address + temp_mac=${BOOTIF#*-} + + # convert to typical mac address format by replacing "-" with ":" + bootif_mac="" + IFS='-' + for x in $temp_mac + do + if [ -z "$bootif_mac" ] + then + bootif_mac="$x" + else + bootif_mac="$bootif_mac:$x" + fi + done + unset IFS - for device in /sys/class/net/* - do - if [ -f "$device/address" ] - then - current_mac=$(cat "$device/address") + # look for devices with matching mac address, and set DEVICE to + # appropriate value if match is found. - if [ "$bootif_mac" = "$current_mac" ] + for device in /sys/class/net/* + do + if [ -f "$device/address" ] then - DEVICE=${device##*/} - break + current_mac=$(cat "$device/address") + + if [ "$bootif_mac" = "$current_mac" ] + then + DEVICE=${device##*/} + break + fi fi - fi - done + done fi - } do_netsetup () diff --git a/scripts/boot/9990-overlay.sh b/components/9990-overlay.sh similarity index 99% rename from scripts/boot/9990-overlay.sh rename to components/9990-overlay.sh index c6de171..6b62093 100755 --- a/scripts/boot/9990-overlay.sh +++ b/components/9990-overlay.sh @@ -381,7 +381,7 @@ setup_unionfs () # Gather information about custom mounts from devies detected as overlays get_custom_mounts ${custom_mounts} ${overlay_devices} - [ -n "${DEBUG}" ] && cp ${custom_mounts} "/lib/live/mount/persistence" + [ -n "${LIVE_BOOT_DEBUG}" ] && cp ${custom_mounts} "/lib/live/mount/persistence" # Now we do the actual mounting (and symlinking) local used_overlays diff --git a/scripts/boot/9990-select-eth-device.sh b/components/9990-select-eth-device.sh similarity index 96% rename from scripts/boot/9990-select-eth-device.sh rename to components/9990-select-eth-device.sh index 14fa4ef..7d1aa16 100755 --- a/scripts/boot/9990-select-eth-device.sh +++ b/components/9990-select-eth-device.sh @@ -6,7 +6,7 @@ Select_eth_device () bootconf=$(egrep '^BOOT=' /conf/initramfs.conf | tail -1) # can be superseded by command line (used by Debian-Live's netboot for example) - for ARGUMENT in ${_CMDLINE} + for ARGUMENT in ${LIVE_BOOT_CMDLINE} do case "${ARGUMENT}" in netboot=*) @@ -46,7 +46,7 @@ Select_eth_device () fi # If user force to use specific device, write it - for ARGUMENT in ${_CMDLINE} + for ARGUMENT in ${LIVE_BOOT_CMDLINE} do case "${ARGUMENT}" in live-netdev=*) diff --git a/scripts/boot/9990-toram-todisk.sh b/components/9990-toram-todisk.sh similarity index 97% rename from scripts/boot/9990-toram-todisk.sh rename to components/9990-toram-todisk.sh index 2643eb8..e7938e0 100755 --- a/scripts/boot/9990-toram-todisk.sh +++ b/components/9990-toram-todisk.sh @@ -10,7 +10,7 @@ copy_live_to () if [ -z "${MODULETORAM}" ] then - size=$(fs_size "" ${copyfrom}/${LIVE_MEDIA_PATH} "used") + size=$(fs_size "" ${copyfrom}/ "used") else MODULETORAMFILE="${copyfrom}/${LIVE_MEDIA_PATH}/${MODULETORAM}" diff --git a/scripts/boot.sh b/frontend/live-boot similarity index 71% rename from scripts/boot.sh rename to frontend/live-boot index 67585f9..32d0a3b 100755 --- a/scripts/boot.sh +++ b/frontend/live-boot @@ -11,10 +11,10 @@ do fi done -for _SCRIPT in /lib/live/boot/????-* +for _COMONENT in /lib/live/boot/????-* do - if [ -e "${_SCRIPT}" ] + if [ -e "${_COMONENT}" ] then - . ${_SCRIPT} + . ${_COMONENT} fi done diff --git a/bin/live-swapfile b/frontend/live-swapfile similarity index 100% rename from bin/live-swapfile rename to frontend/live-swapfile diff --git a/manpages/bin/update-version.sh b/manpages/bin/update-version.sh index 3670d7e..725ebab 100755 --- a/manpages/bin/update-version.sh +++ b/manpages/bin/update-version.sh @@ -1,6 +1,6 @@ #!/bin/sh -## live-boot(7) - System Boot Scripts +## live-boot(7) - System Boot Components ## Copyright (C) 2006-2013 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7 index cee342f..07ddb64 100644 --- a/manpages/de/live-boot.de.7 +++ b/manpages/de/live-boot.de.7 @@ -3,13 +3,13 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BOOT 7 2013\-05\-27 4.0~a13\-1 "Live Systems Project" +.TH LIVE\-BOOT 7 13.09.2013 4.0~a14\-1 "Live Systems Project" .SH NAME -\fBlive\-boot\fP \- System Boot Scripts +\fBlive\-boot\fP \- System Boot Components .SH DESCRIPTION -\fBlive\-boot\fP contains the scripts that configure a live system during the +\fBlive\-boot\fP contains the components that configure a live system during the boot process (early userspace). .PP .\" FIXME @@ -177,8 +177,7 @@ This parameter enables usage of local swap partitions. live\-boot will probe devices for persistence media. These can be partitions (with the correct GPT name), filesystems (with the correct label) or image files (with the correct file name). Overlays are labeled/named "persistence" -(see \fIpersistence.conf\fP(5)). Overlay image files have extensions which -determines their filesystem, e.g. "persistence.ext4". +(see \fIpersistence.conf\fP(5)). Overlay image files are named "persistence". .IP "\fBpersistence\-encryption\fP=\fITYPE1\fP,\fITYPE2\fP ... \fITYPEn\fP" 4 This option determines which types of encryption that we allow to be used when probing devices for persistence media. If "none" is in the list, we diff --git a/manpages/de/persistence.conf.de.5 b/manpages/de/persistence.conf.de.5 index d6a729d..a125356 100644 --- a/manpages/de/persistence.conf.de.5 +++ b/manpages/de/persistence.conf.de.5 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BOOT conf 2013\-05\-27 4.0~a13\-1 "Live Systems Project" +.TH LIVE\-BOOT conf 13.09.2013 4.0~a14\-1 "Live Systems Project" .SH NAME \fBpersistence.conf\fP \- Configuration file for persistence media in live\-boot diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7 index a813190..a293dfc 100644 --- a/manpages/en/live-boot.7 +++ b/manpages/en/live-boot.7 @@ -1,10 +1,10 @@ -.TH LIVE\-BOOT 7 2013\-05\-27 4.0~a13-1 "Live Systems Project" +.TH LIVE\-BOOT 7 2013\-09\-13 4.0~a14-1 "Live Systems Project" .SH NAME -\fBlive\-boot\fR \- System Boot Scripts +\fBlive\-boot\fR \- System Boot Components .SH DESCRIPTION -\fBlive\-boot\fR contains the scripts that configure a live system during the boot process (early userspace). +\fBlive\-boot\fR contains the components that configure a live system during the boot process (early userspace). .PP .\" FIXME live\-boot is a hook for the initramfs\-tools, used to generate a initramfs capable to boot live systems, such as those created by \fIlive\-helper\fR(7). This includes the Live systems ISOs, netboot tarballs, and usb stick images. @@ -107,7 +107,7 @@ This parameters allows to set a custom ramdisk size (it's the '\-o size' option .IP "\fBswapon\fR" 4 This parameter enables usage of local swap partitions. .IP "\fBpersistence\fR" 4 -live\-boot will probe devices for persistence media. These can be partitions (with the correct GPT name), filesystems (with the correct label) or image files (with the correct file name). Overlays are labeled/named "persistence" (see \fIpersistence.conf\fR(5)). Overlay image files have extensions which determines their filesystem, e.g. "persistence.ext4". +live\-boot will probe devices for persistence media. These can be partitions (with the correct GPT name), filesystems (with the correct label) or image files (with the correct file name). Overlays are labeled/named "persistence" (see \fIpersistence.conf\fR(5)). Overlay image files are named "persistence". .IP "\fBpersistence\-encryption\fR=\fITYPE1\fR,\fITYPE2\fR ... \fITYPEn\fR" 4 This option determines which types of encryption that we allow to be used when probing devices for persistence media. If "none" is in the list, we allow unencrypted media; if "luks" is in the list, we allow LUKS\-encrypted media. Whenever a device containing encrypted media is probed the user will be prompted for the passphrase. The default value is "none". .IP "\fBpersistence\-media\fR={\fIremovable\fR|\fIremovable\-usb\fR}" 4 diff --git a/manpages/en/persistence.conf.5 b/manpages/en/persistence.conf.5 index fefb604..fac062e 100644 --- a/manpages/en/persistence.conf.5 +++ b/manpages/en/persistence.conf.5 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT conf 2013\-05\-27 4.0~a13-1 "Live Systems Project" +.TH LIVE\-BOOT conf 2013\-09\-13 4.0~a14-1 "Live Systems Project" .SH NAME \fBpersistence.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 6b773db..c287586 100644 --- a/manpages/es/live-boot.es.7 +++ b/manpages/es/live-boot.es.7 @@ -3,14 +3,14 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BOOT 7 2013\-05\-27 4.0~a13\-1 "Proyecto Live Systems" +.TH LIVE\-BOOT 7 13.09.2013 4.0~a14\-1 "Proyecto Live Systems" .SH NOMBRE -\fBlive\-boot\fP \- Scripts de Arranque del Sistema +\fBlive\-boot\fP \- Componentes de Arranque del Sistema .SH DESCRIPCIÓN -\fBlive\-boot\fP contiene los scripts que configuran un sistema en vivo durante -el proceso de arranque (early userspace). +\fBlive\-boot\fP contiene los componentes que configuran un sistema en vivo +durante el proceso de arranque (early userspace). .PP .\" FIXME live\-boot es un hook para initramfs\-tools, usado para generar un initramfs @@ -187,8 +187,8 @@ live\-boot buscará dispositivos con "persistence". Estos pueden ser particiones (con el nombre GPT correcto), sistemas de ficheros (con la etiqueta correcta) o ficheros imagen (con el nombre de fichero correcto). Los overlays tienen la etiqueta/nombre "persistence" (ver -\fIpersistence.conf\fP(5)). Los ficheros imagen overlay tienen extensiones que -determinan su sistema de ficheros, por ejemplo, "persistence.ext4". +\fIpersistence.conf\fP(5)). Los ficheros imagen overlay tienen, como nombre, +"persistence". .IP "\fBpersistence\-encryption\fP=\fITYPE1\fP,\fITYPE2\fP ... \fITYPEn\fP" 4 Esta opción determina qué tipo de cifrado se usa cuando se prueban los dispositivos de los medios con persistencia. Si se especifica "none" en la diff --git a/manpages/es/persistence.conf.es.5 b/manpages/es/persistence.conf.es.5 index 78ba406..f17294f 100644 --- a/manpages/es/persistence.conf.es.5 +++ b/manpages/es/persistence.conf.es.5 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BOOT conf 2013\-05\-27 4.0~a13\-1 "Proyecto Live Systems" +.TH LIVE\-BOOT conf 13.09.2013 4.0~a14\-1 "Proyecto Live Systems" .SH NOMBRE \fBpersistence.conf\fP \- Fichero para configurar medios de almacenamiento con diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po index 66c7725..f551f4d 100644 --- 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 4.0~a13-1\n" -"POT-Creation-Date: 2013-05-27 16:45+0300\n" +"Project-Id-Version: live-boot 4.0~a14-1\n" +"POT-Creation-Date: 2013-09-13 14:16+0300\n" "PO-Revision-Date: 2013-04-13 16:48+0100\n" "Last-Translator: Carlos Zuferri \n" "Language-Team: none\n" @@ -23,13 +23,15 @@ msgstr "" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 -msgid "2013-05-27" -msgstr "27.05.2013" +#, no-wrap +msgid "2013-09-13" +msgstr "13.09.2013" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 -msgid "4.0~a13-1" -msgstr "4.0~a13-1" +#, no-wrap +msgid "4.0~a14-1" +msgstr "4.0~a14-1" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 @@ -45,7 +47,7 @@ msgstr "" #. type: Plain text #: en/live-boot.7:5 -msgid "B - System Boot Scripts" +msgid "B - System Boot Components" msgstr "" #. type: SH @@ -57,7 +59,7 @@ msgstr "" #. type: Plain text #: en/live-boot.7:8 msgid "" -"B contains the scripts that configure a live system during the " +"B contains the components that configure a live system during the " "boot process (early userspace)." msgstr "" @@ -558,8 +560,8 @@ msgid "" "live-boot will probe devices for persistence media. These can be partitions " "(with the correct GPT name), filesystems (with the correct label) or image " "files (with the correct file name). Overlays are labeled/named \"persistence" -"\" (see I(5)). Overlay image files have extensions which " -"determines their filesystem, e.g. \"persistence.ext4\"." +"\" (see I(5)). Overlay image files are named \"persistence" +"\"." msgstr "" #. type: IP diff --git a/manpages/po/de/persistence.conf.5.po b/manpages/po/de/persistence.conf.5.po index 48a094e..11aaf2e 100644 --- a/manpages/po/de/persistence.conf.5.po +++ b/manpages/po/de/persistence.conf.5.po @@ -4,8 +4,8 @@ # msgid "" msgstr "" -"Project-Id-Version: live-boot 4.0~a13-1\n" -"POT-Creation-Date: 2013-05-27 16:45+0300\n" +"Project-Id-Version: live-boot 4.0~a14-1\n" +"POT-Creation-Date: 2013-09-13 14:16+0300\n" "PO-Revision-Date: 2013-04-13 16:48+0100\n" "Last-Translator: Carlos Zuferri \n" "Language-Team: none\n" @@ -23,13 +23,15 @@ msgstr "" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 -msgid "2013-05-27" -msgstr "27.05.2013" +#, no-wrap +msgid "2013-09-13" +msgstr "13.09.2013" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 -msgid "4.0~a13-1" -msgstr "4.0~a13-1" +#, no-wrap +msgid "4.0~a14-1" +msgstr "4.0~a14-1" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 diff --git a/manpages/po/es/live-boot.7.po b/manpages/po/es/live-boot.7.po index 0429ab4..5a87725 100644 --- a/manpages/po/es/live-boot.7.po +++ b/manpages/po/es/live-boot.7.po @@ -4,9 +4,9 @@ # msgid "" msgstr "" -"Project-Id-Version: live-boot 4.0~a13-1\n" -"POT-Creation-Date: 2013-05-27 16:45+0300\n" -"PO-Revision-Date: 2013-04-13 22:38+0100\n" +"Project-Id-Version: live-boot 4.0~a14-1\n" +"POT-Creation-Date: 2013-09-13 14:16+0300\n" +"PO-Revision-Date: 2013-06-25 20:42+0100\n" "Last-Translator: Carlos Zuferri \n" "Language-Team: none\n" "Language: es\n" @@ -23,13 +23,15 @@ msgstr "LIVE-BOOT" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 -msgid "2013-05-27" -msgstr "27.05.2013" +#, no-wrap +msgid "2013-09-13" +msgstr "13.09.2013" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 -msgid "4.0~a13-1" -msgstr "4.0~a13-1" +#, no-wrap +msgid "4.0~a14-1" +msgstr "4.0~a14-1" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 @@ -45,8 +47,8 @@ msgstr "NOMBRE" #. type: Plain text #: en/live-boot.7:5 -msgid "B - System Boot Scripts" -msgstr "B - Scripts de Arranque del Sistema" +msgid "B - System Boot Components" +msgstr "B - Componentes de Arranque del Sistema" #. type: SH #: en/live-boot.7:6 en/persistence.conf.5:7 @@ -57,11 +59,11 @@ msgstr "DESCRIPCIÓN" #. type: Plain text #: en/live-boot.7:8 msgid "" -"B contains the scripts that configure a live system during the " +"B contains the components that configure a live system during the " "boot process (early userspace)." msgstr "" -"B contiene los scripts que configuran un sistema en vivo durante " -"el proceso de arranque (early userspace)." +"B contiene los componentes que configuran un sistema en vivo " +"durante el proceso de arranque (early userspace)." #. FIXME #. type: Plain text @@ -672,15 +674,14 @@ msgid "" "live-boot will probe devices for persistence media. These can be partitions " "(with the correct GPT name), filesystems (with the correct label) or image " "files (with the correct file name). Overlays are labeled/named \"persistence" -"\" (see I(5)). Overlay image files have extensions which " -"determines their filesystem, e.g. \"persistence.ext4\"." +"\" (see I(5)). Overlay image files are named \"persistence" +"\"." msgstr "" "live-boot buscará dispositivos con \"persistence\". Estos pueden ser " "particiones (con el nombre GPT correcto), sistemas de ficheros (con la " "etiqueta correcta) o ficheros imagen (con el nombre de fichero correcto). " "Los overlays tienen la etiqueta/nombre \"persistence\" (ver I(5)). Los ficheros imagen overlay tienen extensiones que determinan su " -"sistema de ficheros, por ejemplo, \"persistence.ext4\"." +"conf>(5)). Los ficheros imagen overlay tienen, como nombre, \"persistence\"." #. type: IP #: en/live-boot.7:111 diff --git a/manpages/po/es/persistence.conf.5.po b/manpages/po/es/persistence.conf.5.po index 3fb6527..b172f28 100644 --- a/manpages/po/es/persistence.conf.5.po +++ b/manpages/po/es/persistence.conf.5.po @@ -4,8 +4,8 @@ # msgid "" msgstr "" -"Project-Id-Version: live-boot 4.0~a13-1\n" -"POT-Creation-Date: 2013-05-27 16:45+0300\n" +"Project-Id-Version: live-boot 4.0~a14-1\n" +"POT-Creation-Date: 2013-09-13 14:16+0300\n" "PO-Revision-Date: 2013-04-13 16:38+0100\n" "Last-Translator: Carlos Zuferri \n" "Language-Team: none\n" @@ -22,13 +22,15 @@ msgstr "LIVE-BOOT" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 -msgid "2013-05-27" -msgstr "27.05.2013" +#, no-wrap +msgid "2013-09-13" +msgstr "13.09.2013" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 -msgid "4.0~a13-1" -msgstr "4.0~a13-1" +#, no-wrap +msgid "4.0~a14-1" +msgstr "4.0~a14-1" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot index fc596d9..47dad75 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: 2013-05-27 16:45+0300\n" +"POT-Creation-Date: 2013-09-13 14:16+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/persistence.conf.5:1 #, no-wrap -msgid "2013-05-27" +msgid "2013-09-13" msgstr "" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "4.0~a13-1" +msgid "4.0~a14-1" msgstr "" #. type: TH @@ -48,7 +48,7 @@ msgstr "" #. type: Plain text #: en/live-boot.7:5 -msgid "B - System Boot Scripts" +msgid "B - System Boot Components" msgstr "" #. type: SH @@ -60,7 +60,7 @@ msgstr "" #. type: Plain text #: en/live-boot.7:8 msgid "" -"B contains the scripts that configure a live system during the " +"B contains the components that configure a live system during the " "boot process (early userspace)." msgstr "" @@ -561,8 +561,8 @@ msgid "" "live-boot will probe devices for persistence media. These can be partitions " "(with the correct GPT name), filesystems (with the correct label) or image " "files (with the correct file name). Overlays are labeled/named \"persistence" -"\" (see I(5)). Overlay image files have extensions which " -"determines their filesystem, e.g. \"persistence.ext4\"." +"\" (see I(5)). Overlay image files are named \"persistence" +"\"." msgstr "" #. type: IP diff --git a/manpages/pot/persistence.conf.5.pot b/manpages/pot/persistence.conf.5.pot index 2318742..8add7ef 100644 --- a/manpages/pot/persistence.conf.5.pot +++ b/manpages/pot/persistence.conf.5.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot VERSION\n" -"POT-Creation-Date: 2013-05-27 16:45+0300\n" +"POT-Creation-Date: 2013-09-13 14:16+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/persistence.conf.5:1 #, no-wrap -msgid "2013-05-27" +msgid "2013-09-13" msgstr "" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "4.0~a13-1" +msgid "4.0~a14-1" msgstr "" #. type: TH diff --git a/scripts/boot/9990-aaa-fixme.sh b/scripts/boot/9990-aaa-fixme.sh deleted file mode 100755 index 416d6b4..0000000 --- a/scripts/boot/9990-aaa-fixme.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh - -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/medium" -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 - -custom_overlay_label="persistence" -persistence_list="persistence.conf" -old_persistence_list="live-persistence.conf" - -if [ ! -f /live.vars ] -then - touch /live.vars -fi diff --git a/scripts/boot/FIXME b/scripts/boot/FIXME deleted file mode 100644 index be8bb32..0000000 --- a/scripts/boot/FIXME +++ /dev/null @@ -1,28 +0,0 @@ -Note ----- - -live-boot is moving from a monolithic script into a proper -plugin architecture for better maintenance and customization. - -Additionally, this will allow us to abstract initramfs-tools -integration to also support other initrd generators, such as -dracut. - -Unfortunately, from a developers point of view, we could not -finish this in time for wheezy, but we will finish this for -jessie. Please excuse the sorry state of the 9990-* scripts. -From a users point of view, it doesn't matter at all though. - - -Scripts overview ----------------- - -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 - -9xxx FIXME -- 2.1.4