projects
/
live-boot-grml.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5edc4c5
)
Adding upstream version 3.0~a7.
upstream/3.0_a7
author
Daniel Baumann
<daniel@debian.org>
Wed, 9 Mar 2011 16:11:35 +0000
(17:11 +0100)
committer
Daniel Baumann
<daniel@debian.org>
Wed, 9 Mar 2011 16:11:35 +0000
(17:11 +0100)
VERSION
patch
|
blob
|
history
manpages/de/live-boot.de.7
patch
|
blob
|
history
manpages/de/live-snapshot.de.1
patch
|
blob
|
history
manpages/en/live-boot.7
patch
|
blob
|
history
manpages/en/live-snapshot.1
patch
|
blob
|
history
manpages/po/de/live-boot.7.po
patch
|
blob
|
history
manpages/po/de/live-snapshot.1.po
patch
|
blob
|
history
manpages/pot/live-boot.7.pot
patch
|
blob
|
history
manpages/pot/live-snapshot.1.pot
patch
|
blob
|
history
scripts/live
patch
|
blob
|
history
diff --git
a/VERSION
b/VERSION
index
7855bab
..
f47d7b5
100644
(file)
--- a/
VERSION
+++ b/
VERSION
@@
-1
+1
@@
-3.0~a
6
+3.0~a
7
diff --git
a/manpages/de/live-boot.de.7
b/manpages/de/live-boot.de.7
index
3a9ecc8
..
963e019
100644
(file)
--- 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.
.\"
.\"*******************************************************************
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT 7
14.09.2010 3.0~a6
"Debian Live Projekt"
+.TH LIVE\-BOOT 7
25.09.2010 3.0~a7
"Debian Live Projekt"
.SH NAME
\fBlive\-boot\fP \- System Boot Skripte
.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
d102fbd
..
4dcac2a
100644
(file)
--- 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.
.\"
.\"*******************************************************************
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT 1
14.09.2010 3.0~a6
"Debian Live Projekt"
+.TH LIVE\-BOOT 1
25.09.2010 3.0~a7
"Debian Live Projekt"
.SH NAME
\fBlive\-snapshot\fP \- simple script to ease persistence usage
.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
06915d6
..
0467a97
100644
(file)
--- a/
manpages/en/live-boot.7
+++ b/
manpages/en/live-boot.7
@@
-1,4
+1,4
@@
-.TH LIVE\-BOOT 7 2010\-09\-
14 3.0~a6
"Debian Live Project"
+.TH LIVE\-BOOT 7 2010\-09\-
25 3.0~a7
"Debian Live Project"
.SH NAME
\fBlive\-boot\fR \- System Boot Scripts
.SH NAME
\fBlive\-boot\fR \- System Boot Scripts
diff --git
a/manpages/en/live-snapshot.1
b/manpages/en/live-snapshot.1
index
3220f49
..
f4dd2f6
100644
(file)
--- a/
manpages/en/live-snapshot.1
+++ b/
manpages/en/live-snapshot.1
@@
-1,4
+1,4
@@
-.TH LIVE\-BOOT 1 2010\-09\-
14 3.0~a6
"Debian Live Project"
+.TH LIVE\-BOOT 1 2010\-09\-
25 3.0~a7
"Debian Live Project"
.SH NAME
\fBlive\-snapshot\fR \- simple script to ease persistence usage
.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
fe6797b
..
4c688b7
100644
(file)
--- 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~a6\n"
msgid ""
msgstr ""
"Project-Id-Version: live-boot 3.0~a6\n"
-"POT-Creation-Date: 2010-09-
14 08:52
+0300\n"
+"POT-Creation-Date: 2010-09-
25 22:45
+0300\n"
"PO-Revision-Date: 2010-05-24 12:34+0300\n"
"Last-Translator: Daniel Baumann <daniel@debian.org>\n"
"Language-Team: none\n"
"PO-Revision-Date: 2010-05-24 12:34+0300\n"
"Last-Translator: Daniel Baumann <daniel@debian.org>\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
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2010-09-
14
"
-msgstr "
14
.09.2010"
+msgid "2010-09-
25
"
+msgstr "
25
.09.2010"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "3.0~a
6
"
-msgstr "3.0~a
6
"
+msgid "3.0~a
7
"
+msgstr "3.0~a
7
"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1: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
d4b4764
..
7a41a6f
100644
(file)
--- a/
manpages/po/de/live-snapshot.1.po
+++ b/
manpages/po/de/live-snapshot.1.po
@@
-5,7
+5,7
@@
msgid ""
msgstr ""
"Project-Id-Version: live-boot 3.0~a6\n"
msgid ""
msgstr ""
"Project-Id-Version: live-boot 3.0~a6\n"
-"POT-Creation-Date: 2010-09-
14 08:52
+0300\n"
+"POT-Creation-Date: 2010-09-
25 22:45
+0300\n"
"PO-Revision-Date: 2010-05-24 12:34+0300\n"
"Last-Translator: Daniel Baumann <daniel@debian.org>\n"
"Language-Team: none\n"
"PO-Revision-Date: 2010-05-24 12:34+0300\n"
"Last-Translator: Daniel Baumann <daniel@debian.org>\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
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2010-09-
14
"
-msgstr "
14
.09.2010"
+msgid "2010-09-
25
"
+msgstr "
25
.09.2010"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "3.0~a
6
"
-msgstr "3.0~a
6
"
+msgid "3.0~a
7
"
+msgstr "3.0~a
7
"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1: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
b1d7e91
..
1e83d05
100644
(file)
--- 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"
msgid ""
msgstr ""
"Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2010-09-
14 08:52
+0300\n"
+"POT-Creation-Date: 2010-09-
25 22:45
+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"
"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-snapshot.1:1
#, no-wrap
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2010-09-
14
"
+msgid "2010-09-
25
"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "3.0~a
6
"
+msgid "3.0~a
7
"
msgstr ""
#. type: TH
msgstr ""
#. type: TH
diff --git
a/manpages/pot/live-snapshot.1.pot
b/manpages/pot/live-snapshot.1.pot
index
3e8f6e3
..
e1055c1
100644
(file)
--- 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"
msgid ""
msgstr ""
"Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2010-09-
14 08:52
+0300\n"
+"POT-Creation-Date: 2010-09-
25 22:45
+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"
"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-snapshot.1:1
#, no-wrap
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2010-09-
14
"
+msgid "2010-09-
25
"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "3.0~a
6
"
+msgid "3.0~a
7
"
msgstr ""
#. type: TH
msgstr ""
#. type: TH
diff --git
a/scripts/live
b/scripts/live
index
18881af
..
ad2d48e
100755
(executable)
--- a/
scripts/live
+++ b/
scripts/live
@@
-1005,16
+1005,17
@@
find_snap ()
{
# Look for ${snap_label}.* in block devices
snap_label="${1}"
{
# Look for ${snap_label}.* in block devices
snap_label="${1}"
+ black_listed_devices="${2}"
if [ "${PERSISTENT}" != "nofiles" ]
then
# search for image files
if [ "${PERSISTENT}" != "nofiles" ]
then
# search for image files
- snapdata=$(find_files "${PERSISTENT_PATH}${snap_label}.squashfs ${PERSISTENT_PATH}${snap_label}.cpio.gz ${PERSISTENT_PATH}${snap_label}.ext2 ${PERSISTENT_PATH}${snap_label}.ext3 ${PERSISTENT_PATH}${snap_label}.ext4 ${PERSISTENT_PATH}${snap_label}.jffs2")
+ snapdata=$(find_files "${PERSISTENT_PATH}${snap_label}.squashfs ${PERSISTENT_PATH}${snap_label}.cpio.gz ${PERSISTENT_PATH}${snap_label}.ext2 ${PERSISTENT_PATH}${snap_label}.ext3 ${PERSISTENT_PATH}${snap_label}.ext4 ${PERSISTENT_PATH}${snap_label}.jffs2"
"${black_listed_devices}"
)
fi
if [ -z "${snapdata}" ]
then
fi
if [ -z "${snapdata}" ]
then
- snapdata=$(find_cow_device "${snap_label}")
+ snapdata=$(find_cow_device "${snap_label}"
"${black_listed_devices}"
)
fi
echo "${snapdata}"
}
fi
echo "${snapdata}"
}