From c35d9f0f24c12dc26698bbdad9942e671765d389 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 4 Nov 2011 11:39:28 +0100 Subject: [PATCH] Adding upstream version 3.0~a22. --- VERSION | 2 +- bin/live-snapshot | 24 ++++++++++++++++++------ hooks/live | 3 ++- manpages/de/live-boot.de.7 | 2 +- manpages/de/live-snapshot.de.1 | 2 +- manpages/en/live-boot.7 | 2 +- manpages/en/live-snapshot.1 | 2 +- manpages/po/de/live-boot.7.po | 12 ++++++------ manpages/po/de/live-snapshot.1.po | 12 ++++++------ manpages/pot/live-boot.7.pot | 6 +++--- manpages/pot/live-snapshot.1.pot | 6 +++--- scripts/live | 2 +- 12 files changed, 44 insertions(+), 31 deletions(-) diff --git a/VERSION b/VERSION index bfac0ec..812267e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0~a21 +3.0~a22-1 diff --git a/bin/live-snapshot b/bin/live-snapshot index 82addab..ca495fb 100755 --- a/bin/live-snapshot +++ b/bin/live-snapshot @@ -409,6 +409,13 @@ Do_filelist () Do_snapshot () { TMP_FILELIST=$(mktemp -p "${SAFE_TMPDIR}" "${TMP_FILELIST}.XXXXXX") + if [ -e "${EXCLUDE_LIST}" ] + then + # Create a TMP filelist removing empty lines (grep -f does not like them) + # and comments (for speedup and LST) + TMP_EXCLUDE_LIST=$(mktemp -p "${SAFE_TMPDIR}" "${PROGRAM}_excludelist.XXXXXX") + grep -v '^#.*$' "${EXCLUDE_LIST}" | grep -v '^ *$' > "${TMP_EXCLUDE_LIST}" + fi case "${SNAP_TYPE}" in squashfs) @@ -420,7 +427,7 @@ Do_snapshot () if [ -e "${EXCLUDE_LIST}" ] then # Add explicitly excluded files - grep -v '^#.*$' "${EXCLUDE_LIST}" | grep -v '^ *$' >> "${TMP_FILELIST}" + cat "${TMP_EXCLUDE_LIST}" >> "${TMP_FILELIST}" fi cd "${OLDPWD}" @@ -439,12 +446,13 @@ Do_snapshot () cd "${WORKING_DIR}" if [ -e "${EXCLUDE_LIST}" ] then + # Convert \0 to \n and tag existing (rare but possible) \n in filenames, # this to let grep -F -v do a proper work in filtering out cat "${TMP_FILELIST}" | \ tr '\n' '\1' | \ tr '\0' '\n' | \ - grep -F -v -f "${EXCLUDE_LIST}" | \ + grep -F -v -f "${TMP_EXCLUDE_LIST}" | \ tr '\n' '\0' | \ tr '\1' '\n' | \ eval $COPY_CMD || exit 1 @@ -468,10 +476,14 @@ Do_snapshot () ;; esac - if [ -f "${TMP_FILELIST}" ] - then - rm -f "${TMP_FILELIST}" - fi + # Remove temporary file lists + for filelist in "${TMP_FILELIST}" "${TMP_EXCLUDE_LIST}" + do + if [ -f "${filelist}" ] + then + rm -f "${filelist}" + fi + done } Clean () diff --git a/hooks/live b/hooks/live index c916381..b023d4b 100755 --- a/hooks/live +++ b/hooks/live @@ -141,8 +141,9 @@ manual_add_modules squashfs manual_add_modules sqlzma manual_add_modules unlzma -# Filesystem: aufs/unionfs +# Filesystem: aufs/overlayfs/unionfs manual_add_modules aufs +manual_add_modules overlayfs manual_add_modules unionfs # Filesystem: unionfs-fuse diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7 index 6f75c47..5f39939 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 08.09.2011 3.0~a21 "Debian Live Projekt" +.TH LIVE\-BOOT 7 04.11.2011 3.0~a22\-1 "Debian Live Projekt" .SH NAME \fBlive\-boot\fP \- System Boot Skripte diff --git a/manpages/de/live-snapshot.de.1 b/manpages/de/live-snapshot.de.1 index c43576b..9d569a6 100644 --- a/manpages/de/live-snapshot.de.1 +++ b/manpages/de/live-snapshot.de.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BOOT 1 08.09.2011 3.0~a21 "Debian Live Projekt" +.TH LIVE\-BOOT 1 04.11.2011 3.0~a22\-1 "Debian Live Projekt" .SH NAME \fBlive\-snapshot\fP \- simple script to ease persistence usage diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7 index ee1d41d..68e9fe1 100644 --- a/manpages/en/live-boot.7 +++ b/manpages/en/live-boot.7 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT 7 2011\-09\-08 3.0~a21 "Debian Live Project" +.TH LIVE\-BOOT 7 2011\-11\-04 3.0~a22-1 "Debian Live Project" .SH NAME \fBlive\-boot\fR \- System Boot Scripts diff --git a/manpages/en/live-snapshot.1 b/manpages/en/live-snapshot.1 index df98f8b..2f38743 100644 --- a/manpages/en/live-snapshot.1 +++ b/manpages/en/live-snapshot.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BOOT 1 2011\-09\-08 3.0~a21 "Debian Live Project" +.TH LIVE\-BOOT 1 2011\-11\-04 3.0~a22-1 "Debian Live Project" .SH NAME \fBlive\-snapshot\fR \- simple script to ease persistence usage diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po index c851311..770c7d1 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~a21\n" -"POT-Creation-Date: 2011-09-08 21:05+0300\n" +"Project-Id-Version: live-boot 3.0~a22-1\n" +"POT-Creation-Date: 2011-11-04 11:37+0100\n" "PO-Revision-Date: 2010-05-24 12:34+0300\n" "Last-Translator: Daniel Baumann \n" "Language-Team: none\n" @@ -24,14 +24,14 @@ msgstr "LIVE-BOOT" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 #, no-wrap -msgid "2011-09-08" -msgstr "08.09.2011" +msgid "2011-11-04" +msgstr "04.11.2011" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 #, no-wrap -msgid "3.0~a21" -msgstr "3.0~a21" +msgid "3.0~a22-1" +msgstr "3.0~a22-1" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 diff --git a/manpages/po/de/live-snapshot.1.po b/manpages/po/de/live-snapshot.1.po index bff78ca..b65f471 100644 --- a/manpages/po/de/live-snapshot.1.po +++ b/manpages/po/de/live-snapshot.1.po @@ -4,8 +4,8 @@ # msgid "" msgstr "" -"Project-Id-Version: live-boot 3.0~a21\n" -"POT-Creation-Date: 2011-09-08 21:05+0300\n" +"Project-Id-Version: live-boot 3.0~a22-1\n" +"POT-Creation-Date: 2011-11-04 11:37+0100\n" "PO-Revision-Date: 2010-05-24 12:34+0300\n" "Last-Translator: Daniel Baumann \n" "Language-Team: none\n" @@ -24,14 +24,14 @@ msgstr "LIVE-BOOT" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 #, no-wrap -msgid "2011-09-08" -msgstr "08.09.2011" +msgid "2011-11-04" +msgstr "04.11.2011" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 #, no-wrap -msgid "3.0~a21" -msgstr "3.0~a21" +msgid "3.0~a22-1" +msgstr "3.0~a22-1" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot index 97d3f15..dd8c1a4 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: 2011-09-08 21:05+0300\n" +"POT-Creation-Date: 2011-11-04 11:37+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/live-snapshot.1:1 #, no-wrap -msgid "2011-09-08" +msgid "2011-11-04" msgstr "" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 #, no-wrap -msgid "3.0~a21" +msgid "3.0~a22-1" msgstr "" #. type: TH diff --git a/manpages/pot/live-snapshot.1.pot b/manpages/pot/live-snapshot.1.pot index cf17e29..e263e8e 100644 --- a/manpages/pot/live-snapshot.1.pot +++ b/manpages/pot/live-snapshot.1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot VERSION\n" -"POT-Creation-Date: 2011-09-08 21:05+0300\n" +"POT-Creation-Date: 2011-11-04 11:37+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/live-snapshot.1:1 #, no-wrap -msgid "2011-09-08" +msgid "2011-11-04" msgstr "" #. type: TH #: en/live-boot.7:1 en/live-snapshot.1:1 #, no-wrap -msgid "3.0~a21" +msgid "3.0~a22-1" msgstr "" #. type: TH diff --git a/scripts/live b/scripts/live index 5fb8a26..2dc0a7e 100755 --- a/scripts/live +++ b/scripts/live @@ -485,7 +485,7 @@ is_nice_device () { sysfs_path="${1#/sys}" - if /lib/udev/path_id "${sysfs_path}" | egrep -q "ID_PATH=(usb|pci-|platform-sata_mv|platform-orion-ehci|platform-mmc|platform-mxsdhci|)" + if /lib/udev/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]$' -- 2.11.4.GIT