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:
3b14796
)
Adding upstream version 3.0~a14.
upstream/3.0_a14
author
Daniel Baumann
<daniel@debian.org>
Wed, 9 Mar 2011 16:11:41 +0000
(17:11 +0100)
committer
Daniel Baumann
<daniel@debian.org>
Wed, 9 Mar 2011 16:11:41 +0000
(17:11 +0100)
13 files changed:
Makefile
patch
|
blob
|
history
VERSION
patch
|
blob
|
history
hooks/live
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
scripts/live-bottom/23networking
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
6f69012
..
cb931ca
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-6,7
+6,7
@@
LANGUAGES = de
SCRIPTS = bin/* hooks/* scripts/live scripts/live-functions scripts/live-helpers scripts/*/*
SCRIPTS = bin/* hooks/* scripts/live scripts/live-functions scripts/live-helpers scripts/*/*
-all:
test
build
+all: build
test:
@echo -n "Checking for syntax errors"
test:
@echo -n "Checking for syntax errors"
diff --git
a/VERSION
b/VERSION
index
abdb08b
..
e9c3b95
100644
(file)
--- a/
VERSION
+++ b/
VERSION
@@
-1
+1
@@
-3.0~a1
3
+3.0~a1
4
diff --git
a/hooks/live
b/hooks/live
index
93a2831
..
f68800d
100755
(executable)
--- a/
hooks/live
+++ b/
hooks/live
@@
-175,7
+175,8
@@
copy_exec /usr/bin/md5sum /bin
if [ -x /usr/bin/memdiskfind ]
then
copy_exec /usr/bin/memdiskfind
if [ -x /usr/bin/memdiskfind ]
then
copy_exec /usr/bin/memdiskfind
- manual_add_modules phram mtdblock
+ manual_add_modules phram
+ manual_add_modules mtdblock
fi
# Program: cpio
fi
# Program: cpio
diff --git
a/manpages/de/live-boot.de.7
b/manpages/de/live-boot.de.7
index
26cfc5d
..
a67253f
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
06.12.2010 3.0~a13
"Debian Live Projekt"
+.TH LIVE\-BOOT 7
2011\-01\-11 3.0~a14
"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
2302ad1
..
e080c99
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
06.12.2010 3.0~a13
"Debian Live Projekt"
+.TH LIVE\-BOOT 1
2011\-01\-11 3.0~a14
"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
d5041be
..
80edf70
100644
(file)
--- a/
manpages/en/live-boot.7
+++ b/
manpages/en/live-boot.7
@@
-1,4
+1,4
@@
-.TH LIVE\-BOOT 7 201
0\-12\-06 3.0~a13
"Debian Live Project"
+.TH LIVE\-BOOT 7 201
1\-01\-11 3.0~a14
"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
5b4e9ef
..
bd1a087
100644
(file)
--- a/
manpages/en/live-snapshot.1
+++ b/
manpages/en/live-snapshot.1
@@
-1,4
+1,4
@@
-.TH LIVE\-BOOT 1 201
0\-12\-06 3.0~a13
"Debian Live Project"
+.TH LIVE\-BOOT 1 201
1\-01\-11 3.0~a14
"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
5f9a676
..
dda7dd5
100644
(file)
--- a/
manpages/po/de/live-boot.7.po
+++ b/
manpages/po/de/live-boot.7.po
@@
-4,8
+4,8
@@
#
msgid ""
msgstr ""
#
msgid ""
msgstr ""
-"Project-Id-Version: live-boot 3.0~a1
3
\n"
-"POT-Creation-Date: 201
0-12-06 11:27
+0100\n"
+"Project-Id-Version: live-boot 3.0~a1
4
\n"
+"POT-Creation-Date: 201
1-01-11 13:39
+0100\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,13
@@
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 "201
0-12-06
"
-msgstr "
06.12.2010
"
+msgid "201
1-01-11
"
+msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
-#, no-wrap
-msgid "3.0~a13"
-msgstr "3.0~a13"
+msgid "3.0~a14"
+msgstr "3.0~a14"
#. 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
0c1719d
..
c67050f
100644
(file)
--- a/
manpages/po/de/live-snapshot.1.po
+++ b/
manpages/po/de/live-snapshot.1.po
@@
-4,8
+4,8
@@
#
msgid ""
msgstr ""
#
msgid ""
msgstr ""
-"Project-Id-Version: live-boot 3.0~a1
3
\n"
-"POT-Creation-Date: 201
0-12-06 11:27
+0100\n"
+"Project-Id-Version: live-boot 3.0~a1
4
\n"
+"POT-Creation-Date: 201
1-01-11 13:39
+0100\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,13
@@
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 "201
0-12-06
"
-msgstr "
06.12.2010
"
+msgid "201
1-01-11
"
+msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
-#, no-wrap
-msgid "3.0~a13"
-msgstr "3.0~a13"
+msgid "3.0~a14"
+msgstr "3.0~a14"
#. 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
2836a98
..
f94ea75
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: 201
0-12-06 11:27
+0100\n"
+"POT-Creation-Date: 201
1-01-11 13:39
+0100\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 "201
0-12-06
"
+msgid "201
1-01-11
"
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~a1
3
"
+msgid "3.0~a1
4
"
msgstr ""
#. type: TH
msgstr ""
#. type: TH
diff --git
a/manpages/pot/live-snapshot.1.pot
b/manpages/pot/live-snapshot.1.pot
index
d642156
..
f27f305
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: 201
0-12-06 11:27
+0100\n"
+"POT-Creation-Date: 201
1-01-11 13:39
+0100\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 "201
0-12-06
"
+msgid "201
1-01-11
"
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~a1
3
"
+msgid "3.0~a1
4
"
msgstr ""
#. type: TH
msgstr ""
#. type: TH
diff --git
a/scripts/live
b/scripts/live
index
66f0db0
..
ef87d3c
100755
(executable)
--- a/
scripts/live
+++ b/
scripts/live
@@
-489,6
+489,9
@@
is_nice_device ()
elif echo ${sysfs_path} | grep -q "^/block/dm-"
then
return 0
elif echo ${sysfs_path} | grep -q "^/block/dm-"
then
return 0
+ elif echo ${sysfs_path} | grep -q "^/block/mtdblock"
+ then
+ return 0
fi
return 1
fi
return 1
diff --git
a/scripts/live-bottom/23networking
b/scripts/live-bottom/23networking
index
9554b77
..
86d4562
100755
(executable)
--- a/
scripts/live-bottom/23networking
+++ b/
scripts/live-bottom/23networking
@@
-89,8
+89,8
@@
else
method="manual"
fi
method="manual"
fi
- # iterate the physical interfaces and add them to the interfaces list
- if [ "${method}" != dhcp ] || ([ ! -x /root/usr/sbin/NetworkManager ] && [ ! -x /root/usr/sbin/wicd ])
+ # iterate the physical interfaces and add them to the interfaces list
and also add when ethdevice= called on cmdline
+ if [ "${method}" != dhcp ] || ([ ! -x /root/usr/sbin/NetworkManager ] && [ ! -x /root/usr/sbin/wicd ])
|| [ ! -z "${ETHDEVICE}" ]
then
for interface in /sys/class/net/eth* /sys/class/net/ath* /sys/class/net/wlan*
do
then
for interface in /sys/class/net/eth* /sys/class/net/ath* /sys/class/net/wlan*
do