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:
5a9cf27
)
Adding upstream version 2.0~a12.
upstream/2.0_a12
author
Daniel Baumann
<daniel@debian.org>
Wed, 7 Jul 2010 18:14:59 +0000
(20:14 +0200)
committer
Daniel Baumann
<daniel@debian.org>
Wed, 7 Jul 2010 18:14:59 +0000
(20:14 +0200)
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
diff --git
a/VERSION
b/VERSION
index
d44f652
..
41bc97f
100644
(file)
--- a/
VERSION
+++ b/
VERSION
@@
-1
+1
@@
-2.0~a1
1
+2.0~a1
2
diff --git
a/hooks/live
b/hooks/live
index
cba7120
..
16a2d0c
100755
(executable)
--- a/
hooks/live
+++ b/
hooks/live
@@
-84,6
+84,9
@@
then
uuidgen -r > "${DESTDIR}"/conf/uuid.conf
fi
uuidgen -r > "${DESTDIR}"/conf/uuid.conf
fi
+# Filesystem: btrfs
+manual_add_modules btrfs
+
# Filesystem: cifs
if [ -x /sbin/mount.cifs ]
then
# Filesystem: cifs
if [ -x /sbin/mount.cifs ]
then
@@
-151,6
+154,13
@@
fi
# Program: md5sum
copy_exec /usr/bin/md5sum /bin
# Program: md5sum
copy_exec /usr/bin/md5sum /bin
+# Program: memdisk
+if [ -x /usr/bin/memdiskfind ]
+then
+ copy_exec /usr/bin/memdiskfind
+ manual_add_modules phram mtdblock
+fi
+
# Program: cpio
# busybox and klibc lacks --no-absolute-filenames and --sparse, needed for snapshots
if [ -e "${DESTDIR}/bin/cpio" ]
# Program: cpio
# busybox and klibc lacks --no-absolute-filenames and --sparse, needed for snapshots
if [ -e "${DESTDIR}/bin/cpio" ]
diff --git
a/manpages/de/live-boot.de.7
b/manpages/de/live-boot.de.7
index
8502267
..
afb7677
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
20.06.2010 2.0~a11
"Debian Live Projekt"
+.TH LIVE\-BOOT 7
07.07.2010 2.0~a12
"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
07065a2
..
320a853
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
20.06.2010 2.0~a11
"Debian Live Projekt"
+.TH LIVE\-BOOT 1
07.07.2010 2.0~a12
"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
c4864d8
..
2d52382
100644
(file)
--- a/
manpages/en/live-boot.7
+++ b/
manpages/en/live-boot.7
@@
-1,4
+1,4
@@
-.TH LIVE\-BOOT 7 2010\-0
6\-20 2.0~a11
"Debian Live Project"
+.TH LIVE\-BOOT 7 2010\-0
7\-07 2.0~a12
"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
9b3aaaa
..
d0704eb
100644
(file)
--- a/
manpages/en/live-snapshot.1
+++ b/
manpages/en/live-snapshot.1
@@
-1,4
+1,4
@@
-.TH LIVE\-BOOT 1 2010\-0
6\-20 2.0~a11
"Debian Live Project"
+.TH LIVE\-BOOT 1 2010\-0
7\-07 2.0~a12
"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
32c1352
..
09fe887
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 2.0~a1
1
\n"
-"POT-Creation-Date: 2010-0
6-20 19:13
+0300\n"
+"Project-Id-Version: live-boot 2.0~a1
2
\n"
+"POT-Creation-Date: 2010-0
7-07 20:12
+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-0
6-20
"
-msgstr "
20.06
.2010"
+msgid "2010-0
7-07
"
+msgstr "
07.07
.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 "2.0~a1
1
"
-msgstr "2.0~a1
1
"
+msgid "2.0~a1
2
"
+msgstr "2.0~a1
2
"
#. 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
03a8f07
..
2274b7f
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 2.0~a1
1
\n"
-"POT-Creation-Date: 2010-0
6-20 19:13
+0300\n"
+"Project-Id-Version: live-boot 2.0~a1
2
\n"
+"POT-Creation-Date: 2010-0
7-07 20:12
+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-0
6-20
"
-msgstr "
20.06
.2010"
+msgid "2010-0
7-07
"
+msgstr "
07.07
.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 "2.0~a1
1
"
-msgstr "2.0~a1
1
"
+msgid "2.0~a1
2
"
+msgstr "2.0~a1
2
"
#. 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
525a6da
..
73e0f80
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-0
6-20 19:13
+0300\n"
+"POT-Creation-Date: 2010-0
7-07 20:12
+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"
@@
-24,13
+24,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-0
6-20
"
+msgid "2010-0
7-07
"
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 "2.0~a1
1
"
+msgid "2.0~a1
2
"
msgstr ""
#. type: TH
msgstr ""
#. type: TH
diff --git
a/manpages/pot/live-snapshot.1.pot
b/manpages/pot/live-snapshot.1.pot
index
d40c782
..
ddca5ff
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-0
6-20 19:13
+0300\n"
+"POT-Creation-Date: 2010-0
7-07 20:12
+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"
@@
-24,13
+24,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-0
6-20
"
+msgid "2010-0
7-07
"
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 "2.0~a1
1
"
+msgid "2.0~a1
2
"
msgstr ""
#. type: TH
msgstr ""
#. type: TH
diff --git
a/scripts/live
b/scripts/live
index
412094a
..
f5f4ad2
100755
(executable)
--- a/
scripts/live
+++ b/
scripts/live
@@
-88,12
+88,8
@@
Arguments ()
ethdevice=*)
DEVICE="${ARGUMENT#ethdevice=}"
ethdevice=*)
DEVICE="${ARGUMENT#ethdevice=}"
- export DEVICE
- ;;
-
- ethdevice=*)
- ETHDEVICE="${ARGUMENT#ethdevice=}"
- export ETHDEVICE
+ ETHDEVICE="${DEVICE}"
+ export DEVICE ETHDEVICE
;;
ethdevice-timeout=*)
;;
ethdevice-timeout=*)
@@
-964,19
+960,20
@@
try_snap ()
snapback="$(echo ${snapdata} | cut -f2 -d ' ')"
snapfile="$(echo ${snapdata} | cut -f3 -d ' ')"
snapback="$(echo ${snapdata} | cut -f2 -d ' ')"
snapfile="$(echo ${snapdata} | cut -f3 -d ' ')"
- RES=""
if ! try_mount "${snapdev}" "${snapback}" "ro"
then
break
fi
if ! try_mount "${snapdev}" "${snapback}" "ro"
then
break
fi
+ RES="0"
+
if echo "${snapfile}" | grep -qs '\(squashfs\|ext2\|ext3\|ext4\|jffs2\)'
then
# squashfs, jffs2 or ext2/ext3/ext4 snapshot
dev=$(get_backing_device "${snapback}/${snapfile}")
do_snap_copy "${dev}" "${snap_mount}" "${snap_type}"
if echo "${snapfile}" | grep -qs '\(squashfs\|ext2\|ext3\|ext4\|jffs2\)'
then
# squashfs, jffs2 or ext2/ext3/ext4 snapshot
dev=$(get_backing_device "${snapback}/${snapfile}")
do_snap_copy "${dev}" "${snap_mount}" "${snap_type}"
- RES=
$?
+ RES=
"$?"
else
# cpio.gz snapshot
else
# cpio.gz snapshot
@@
-992,9
+989,12
@@
try_snap ()
cpioargs='--unconditional --make-directories'
fi
cpioargs='--unconditional --make-directories'
fi
- if ! (cd "${snap_mount}" && zcat "${snapback}/${snapfile}" | cpio $cpioargs --extract --preserve-modification-time --no-absolute-filenames --sparse 2>/dev/null)
+ cd "${snap_mount}" && zcat "${snapback}/${snapfile}" | $cpiopath $cpioargs --extract --preserve-modification-time --no-absolute-filenames --sparse 2>/dev/null
+ RES="$?"
+
+ if [ "${RES}" != "0" ]
then
then
- log_warning_msg "failure to \"zcat ${snapback}/${snapfile} |
cpio
$cpioargs --extract --preserve-modification-time --no-absolute-filenames --sparse\""
+ log_warning_msg "failure to \"zcat ${snapback}/${snapfile} |
$cpiopath
$cpioargs --extract --preserve-modification-time --no-absolute-filenames --sparse\""
fi
fi
fi
fi
@@
-1595,6
+1595,7
@@
find_livefs ()
fi
done
elif [ "${fstype}" = "squashfs" -o \
fi
done
elif [ "${fstype}" = "squashfs" -o \
+ "${fstype}" = "btrfs" -o \
"${fstype}" = "ext2" -o \
"${fstype}" = "ext3" -o \
"${fstype}" = "ext4" -o \
"${fstype}" = "ext2" -o \
"${fstype}" = "ext3" -o \
"${fstype}" = "ext4" -o \
@@
-1704,6
+1705,20
@@
mountroot ()
# Do a local boot from hd
livefs_root=${ROOT}
else
# Do a local boot from hd
livefs_root=${ROOT}
else
+ if [ -x /usr/bin/memdiskfind ]
+ then
+ MEMDISK=$(/usr/bin/memdiskfind)
+
+ if [ $? -eq 0 ]
+ then
+ # We found a memdisk, set up phram
+ modprobe phram phram=memdisk,${MEMDISK}
+
+ # Load mtdblock, the memdisk will be /dev/mtdblock0
+ modprobe mtdblock
+ fi
+ fi
+
# Scan local devices for the image
i=0
while [ "$i" -lt 60 ]
# Scan local devices for the image
i=0
while [ "$i" -lt 60 ]