From: Evgeni Golov Date: Tue, 4 Dec 2012 14:08:51 +0000 (+0100) Subject: Merge remote-tracking branch 'deb/debian' into debian X-Git-Tag: v3.0_b8-1+grml.1~1^2 X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=cd438f06901d6dbc2ca5c2be7dd3d5b03f4b7719;hp=96b643e3a4d8ee0dcf0526182190a9d4526c626b;p=live-boot-grml.git Merge remote-tracking branch 'deb/debian' into debian --- diff --git a/VERSION b/VERSION index f4d2505..df984fa 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0~b6-1 +3.0~b8-1 diff --git a/backends/initramfs-tools/live.hook b/backends/initramfs-tools/live.hook index 738257b..3860f4c 100755 --- a/backends/initramfs-tools/live.hook +++ b/backends/initramfs-tools/live.hook @@ -8,7 +8,7 @@ set -e # Reading configuration file from filesystem and live-media for _FILE in /etc/live/boot.conf /etc/live/boot/* \ - /lib/live/image/live/boot.conf /lib/live/image/live/boot/* + /lib/live/mount/media/live/boot.conf /lib/live/mount/media/live/boot/* do if [ -e "${_FILE}" ] then diff --git a/debian/changelog b/debian/changelog index 381fe95..c42aa54 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,32 @@ +live-boot (3.0~b8-1) unstable; urgency=low + + * Removing eject from recommends, the script that ejects the live medium + is in live-config these days. + * Removing file from recommends, no usage of file in live-boot anymore. + * Updating package lists in bug script to match current implementations. + * Adding dpkg-source local options. + + -- Daniel Baumann Fri, 30 Nov 2012 14:48:16 +0100 + +live-boot (3.0~b7-1) unstable; urgency=low + + [ Daniel Baumann ] + * Updating file paths for /lib/live/mount. See + http://lists.debian.org/debian-live/2012/10/msg00021.html for more + information. + * Renaming /lib/live/mount/image to /lib/live/mount/medium. See + http://lists.debian.org/debian-live/2012/10/msg00023.html for more + information. + * Updating package descriptions. + * Properly wrap package descriptions to 80 characters per line. + + [ Tails developers ] + * Adding support for the previous persistence configuration file name, + for compatibility with systems that have been deployed with live- + persistence.conf already. + + -- Daniel Baumann Wed, 07 Nov 2012 15:04:32 +0100 + live-boot (3.0~b6-1) unstable; urgency=low * Including hfs and hfsplus modules in initrd to access filesystems on diff --git a/debian/control b/debian/control index f0f1948..a4e0cf3 100644 --- a/debian/control +++ b/debian/control @@ -12,11 +12,11 @@ Vcs-Git: git://live.debian.net/git/live-boot.git Package: live-boot Architecture: all Depends: ${misc:Depends}, live-boot-initramfs-tools | live-boot-backend -Recommends: live-boot-doc, eject, file, rsync, uuid-runtime +Recommends: live-boot-doc, rsync, uuid-runtime Suggests: curlftpfs, cryptsetup, httpfs2, unionfs-fuse, wget -Description: Debian Live - System Boot Scripts - live-boot contains the scripts that configure a Debian Live system during the - boot process (early userspace). +Description: Live System Boot Scripts + live-boot contains the scripts that configure a live system during the boot + process (early userspace). . In addition to live-boot, a backend for the initrd generation is required, such as live-boot-initramfs-tools. @@ -27,9 +27,9 @@ Architecture: all Depends: ${misc:Depends} Conflicts: live-boot (<< 3.0~a18~) Replaces: live-boot -Description: Debian Live - System Boot Scripts (documentation) - live-boot contains the scripts that configure a Debian Live system during the - boot process (early userspace). +Description: Live System Boot Scripts (documentation) + live-boot contains the scripts that configure a live system during the boot + process (early userspace). . This package contains the documentation. @@ -40,8 +40,8 @@ Depends: Conflicts: live-boot-backend Replaces: live-boot-backend Provides: live-boot-backend -Description: Debian Live - System Boot Scripts (initramfs-tools backend) - live-boot contains the scripts that configure a Debian Live system during the - boot process (early userspace). +Description: Live System Boot Scripts (initramfs-tools backend) + live-boot contains the scripts that configure a live system during the boot + process (early userspace). . This package contains the initramfs-tools backend. diff --git a/debian/live-boot.bug-script b/debian/live-boot.bug-script index 385770c..e3f6d36 100644 --- a/debian/live-boot.bug-script +++ b/debian/live-boot.bug-script @@ -1,15 +1,15 @@ #!/bin/sh # Checking depends -dpkg -l busybox file initramfs-tools sudo udev user-setup +dpkg -l busybox busybox-initramfs initramfs-tools udev # Checking recommends -dpkg -l eject uuid-runtime wget +dpkg -l rsync uuid-runtime # Checking suggests -dpkg -l loop-aes-utils curlftpfs genext2fs httpfs2 squashfs-tools mtd-tools +dpkg -l curlftpfs cryptsetup httpfs2 unionfs-fuse wget # Checking other packages -dpkg -l cryptsetup plymouth +dpkg -l plymouth exit 0 diff --git a/debian/source/local-options b/debian/source/local-options new file mode 100644 index 0000000..2ee6f0f --- /dev/null +++ b/debian/source/local-options @@ -0,0 +1 @@ +abort-on-upstream-changes diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7 index 8116112..f53ee09 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 02.10.2012 3.0~b6\-1 "Debian Live Project" +.TH LIVE\-BOOT 7 30.11.2012 3.0~b8\-1 "Debian Live Project" .SH NAME \fBlive\-boot\fP \- System Boot Scripts diff --git a/manpages/de/persistence.conf.de.5 b/manpages/de/persistence.conf.de.5 index cbac9e9..756f4a9 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 02.10.2012 3.0~b6\-1 "Debian Live Project" +.TH LIVE\-BOOT conf 30.11.2012 3.0~b8\-1 "Debian Live 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 cebe297..ac560b7 100644 --- a/manpages/en/live-boot.7 +++ b/manpages/en/live-boot.7 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT 7 2012\-10\-02 3.0~b6-1 "Debian Live Project" +.TH LIVE\-BOOT 7 2012\-11\-30 3.0~b8-1 "Debian Live Project" .SH NAME \fBlive\-boot\fR \- System Boot Scripts diff --git a/manpages/en/persistence.conf.5 b/manpages/en/persistence.conf.5 index 83b022c..a361ddc 100644 --- a/manpages/en/persistence.conf.5 +++ b/manpages/en/persistence.conf.5 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT conf 2012\-10\-02 3.0~b6-1 "Debian Live Project" +.TH LIVE\-BOOT conf 2012\-11\-30 3.0~b8-1 "Debian Live 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 6af0f8e..a68ead3 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 02.10.2012 3.0~b6\-1 "Proyecto Debian Live" +.TH LIVE\-BOOT 7 30.11.2012 3.0~b8\-1 "Proyecto Debian Live" .SH NOMBRE \fBlive\-boot\fP \- Scripts de Arranque del Sistema diff --git a/manpages/es/persistence.conf.es.5 b/manpages/es/persistence.conf.es.5 index 3f13b77..b985f45 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 02.10.2012 3.0~b6\-1 "Proyecto Debian Live" +.TH LIVE\-BOOT conf 30.11.2012 3.0~b8\-1 "Proyecto Debian Live" .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 d24cbed..bacb8c0 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 3.0~b6-1\n" -"POT-Creation-Date: 2012-10-02 10:38+0300\n" +"Project-Id-Version: live-boot 3.0~b8-1\n" +"POT-Creation-Date: 2012-11-30 14:47+0100\n" "PO-Revision-Date: 2012-04-08 22:48+0300\n" "Last-Translator: Daniel Baumann \n" "Language-Team: none\n" @@ -24,14 +24,14 @@ msgstr "" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "2012-10-02" -msgstr "02.10.2012" +msgid "2012-11-30" +msgstr "30.11.2012" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "3.0~b6-1" -msgstr "3.0~b6-1" +msgid "3.0~b8-1" +msgstr "3.0~b8-1" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 diff --git a/manpages/po/de/persistence.conf.5.po b/manpages/po/de/persistence.conf.5.po index 6096946..93d438a 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 3.0~b6-1\n" -"POT-Creation-Date: 2012-10-02 10:38+0300\n" +"Project-Id-Version: live-boot 3.0~b8-1\n" +"POT-Creation-Date: 2012-11-30 14:47+0100\n" "PO-Revision-Date: 2012-04-08 22:48+0300\n" "Last-Translator: Daniel Baumann \n" "Language-Team: none\n" @@ -24,14 +24,14 @@ msgstr "" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "2012-10-02" -msgstr "02.10.2012" +msgid "2012-11-30" +msgstr "30.11.2012" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "3.0~b6-1" -msgstr "3.0~b6-1" +msgid "3.0~b8-1" +msgstr "3.0~b8-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 6e43a91..f197e91 100644 --- a/manpages/po/es/live-boot.7.po +++ b/manpages/po/es/live-boot.7.po @@ -4,8 +4,8 @@ # msgid "" msgstr "" -"Project-Id-Version: live-boot 3.0~b6-1\n" -"POT-Creation-Date: 2012-10-02 10:38+0300\n" +"Project-Id-Version: live-boot 3.0~b8-1\n" +"POT-Creation-Date: 2012-11-30 14:47+0100\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/persistence.conf.5:1 #, no-wrap -msgid "2012-10-02" -msgstr "02.10.2012" +msgid "2012-11-30" +msgstr "30.11.2012" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "3.0~b6-1" -msgstr "3.0~b6-1" +msgid "3.0~b8-1" +msgstr "3.0~b8-1" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 diff --git a/manpages/po/es/persistence.conf.5.po b/manpages/po/es/persistence.conf.5.po index 3fe87c3..ffdb343 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 3.0~b6-1\n" -"POT-Creation-Date: 2012-10-02 10:38+0300\n" +"Project-Id-Version: live-boot 3.0~b8-1\n" +"POT-Creation-Date: 2012-11-30 14:47+0100\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/persistence.conf.5:1 #, no-wrap -msgid "2012-10-02" -msgstr "02.10.2012" +msgid "2012-11-30" +msgstr "30.11.2012" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "3.0~b6-1" -msgstr "3.0~b6-1" +msgid "3.0~b8-1" +msgstr "3.0~b8-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 0ff156a..7d6b021 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-10-02 10:38+0300\n" +"POT-Creation-Date: 2012-11-30 14:47+0100\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 "2012-10-02" +msgid "2012-11-30" msgstr "" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "3.0~b6-1" +msgid "3.0~b8-1" msgstr "" #. type: TH diff --git a/manpages/pot/persistence.conf.5.pot b/manpages/pot/persistence.conf.5.pot index 760a53c..41c76d4 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: 2012-10-02 10:38+0300\n" +"POT-Creation-Date: 2012-11-30 14:47+0100\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 "2012-10-02" +msgid "2012-11-30" msgstr "" #. type: TH #: en/live-boot.7:1 en/persistence.conf.5:1 #, no-wrap -msgid "3.0~b6-1" +msgid "3.0~b8-1" msgstr "" #. type: TH diff --git a/scripts/boot/9990-aaa-fixme.sh b/scripts/boot/9990-aaa-fixme.sh index 822a604..a1eb14a 100755 --- a/scripts/boot/9990-aaa-fixme.sh +++ b/scripts/boot/9990-aaa-fixme.sh @@ -5,7 +5,7 @@ export PATH="/root/usr/bin:/root/usr/sbin:/root/bin:/root/sbin:/usr/bin:/usr/sbi echo "/root/lib" >> /etc/ld.so.conf echo "/root/usr/lib" >> /etc/ld.so.conf -mountpoint="/live/image" +mountpoint="/live/medium" alt_mountpoint="/media" LIVE_MEDIA_PATH="live" @@ -44,6 +44,7 @@ old_root_overlay_label="live-rw" old_home_overlay_label="home-rw" custom_overlay_label="persistence" persistence_list="persistence.conf" +old_persistence_list="live-persistence.conf" if [ ! -f /live.vars ] then diff --git a/scripts/boot/9990-main.sh b/scripts/boot/9990-main.sh index ef41fb0..983a1cb 100755 --- a/scripts/boot/9990-main.sh +++ b/scripts/boot/9990-main.sh @@ -146,8 +146,8 @@ Main () esac # Move to the new root filesystem so that programs there can get at it. - mkdir -p /root/lib/live/image - mount --move /live/image /root/lib/live/image + mkdir -p /root/lib/live/mount/medium + mount --move /live/medium /root/lib/live/mount/medium # aufs2 in kernel versions around 2.6.33 has a regression: # directories can't be accessed when read for the first the time, @@ -158,8 +158,8 @@ Main () # Move findiso directory to the new root filesystem so that programs there can get at it. if [ -d /live/findiso ] then - mkdir -p /root/lib/live/findiso - mount -n --move /live/findiso /root/lib/live/findiso + mkdir -p /root/lib/live/mount/findiso + mount -n --move /live/findiso /root/lib/live/mount/findiso fi # if we do not unmount the ISO we can't run "fsck /dev/ice" later on @@ -169,10 +169,10 @@ Main () then losetup -d /dev/loop0 - if is_mountpoint /root/lib/live/findiso + if is_mountpoint /root/lib/live/mount/findiso then - umount /root/lib/live/findiso - rmdir --ignore-fail-on-non-empty /root/lib/live/findiso \ + umount /root/lib/live/mount/findiso + rmdir --ignore-fail-on-non-empty /root/lib/live/mount/findiso \ >/dev/null 2>&1 || true fi fi diff --git a/scripts/boot/9990-misc-helpers.sh b/scripts/boot/9990-misc-helpers.sh index 3455045..ace130b 100755 --- a/scripts/boot/9990-misc-helpers.sh +++ b/scripts/boot/9990-misc-helpers.sh @@ -940,7 +940,7 @@ find_persistence_media () local white_listed_devices="${2}" local ret="" - local black_listed_devices="$(what_is_mounted_on /live/image)" + local black_listed_devices="$(what_is_mounted_on /live/medium)" for dev in $(storage_devices "${black_listed_devices}" "${white_listed_devices}") do @@ -1258,9 +1258,14 @@ get_custom_mounts () continue fi - local include_list="${backing}/${persistence_list}" - if [ ! -r "${include_list}" ] + local include_list + 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 diff --git a/scripts/boot/9990-overlay.sh b/scripts/boot/9990-overlay.sh index 13c1a0c..acb2e91 100755 --- a/scripts/boot/9990-overlay.sh +++ b/scripts/boot/9990-overlay.sh @@ -404,22 +404,22 @@ setup_unionfs () do if [ -d "/live/${_DIRECTORY}" ] then - mkdir -p "${rootmnt}/lib/live/${_DIRECTORY}" + mkdir -p "${rootmnt}/lib/live/mount/${_DIRECTORY}" for _MOUNT in $(ls /live/${_DIRECTORY}) do - mkdir -p "${rootmnt}/lib/live/${_DIRECTORY}/${_MOUNT}" - mount -o move "/live/${_DIRECTORY}/${_MOUNT}" "${rootmnt}/lib/live/${_DIRECTORY}/${_MOUNT}" > /dev/null 2>&1 || \ - mount -o bind "/live/${_DIRECTORY}/${_MOUNT}" "${rootmnt}/lib/live/${_DIRECTORY}/${_MOUNT}" || \ - log_warning_msg "W: failed to mount /live/${_DIRECTORY}/${_MOUNT} to ${rootmnt}/lib/live/${_DIRECTORY}/${_MOUNT}" + mkdir -p "${rootmnt}/lib/live/mount/${_DIRECTORY}/${_MOUNT}" + mount -o move "/live/${_DIRECTORY}/${_MOUNT}" "${rootmnt}/lib/live/mount/${_DIRECTORY}/${_MOUNT}" > /dev/null 2>&1 || \ + mount -o bind "/live/${_DIRECTORY}/${_MOUNT}" "${rootmnt}/lib/live/mount/${_DIRECTORY}/${_MOUNT}" || \ + log_warning_msg "W: failed to mount /live/${_DIRECTORY}/${_MOUNT} to ${rootmnt}/lib/live/mount/${_DIRECTORY}/${_MOUNT}" done fi done - mkdir -p "${rootmnt}/lib/live/overlay" - mount -o move /live/overlay "${rootmnt}/lib/live/overlay" > /dev/null 2>&1 || \ - mount -o bind /live/overlay "${rootmnt}/lib/live/overlay" || \ - log_warning_msg "W: failed to mount /live/overlay to ${rootmnt}/lib/live/overlay" + mkdir -p "${rootmnt}/lib/live/mount/overlay" + mount -o move /live/overlay "${rootmnt}/lib/live/mount/overlay" > /dev/null 2>&1 || \ + mount -o bind /live/overlay "${rootmnt}/lib/live/mount/overlay" || \ + log_warning_msg "W: failed to mount /live/overlay to ${rootmnt}/lib/live/mount/overlay" # ensure that a potentially stray tmpfs gets removed # otherways, initramfs-tools is unable to remove /live