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 (from parent 1:
8e528a9
)
Fixes "live-snapshot on reboot could not find a writable '/tmp' or '/mnt'" bug.
author
Marco Amadori
<marco.amadori@gmail.com>
Fri, 30 May 2008 22:18:32 +0000
(
00:18
+0200)
committer
Daniel Baumann
<daniel@debian.org>
Wed, 9 Mar 2011 16:47:59 +0000
(17:47 +0100)
bin/live-snapshot
patch
|
blob
|
history
diff --git
a/bin/live-snapshot
b/bin/live-snapshot
index
c50bcc0
..
b5a7fa4
100755
(executable)
--- a/
bin/live-snapshot
+++ b/
bin/live-snapshot
@@
-2,7
+2,7
@@
# live-snapshot - utility to manage Debian Live systems snapshots
#
# live-snapshot - utility to manage Debian Live systems snapshots
#
-# This program mount a device (fallback to /tmpfs under
/mnt/snapshot
+# This program mount a device (fallback to /tmpfs under
$MOUNTP
# and save the /live/cow (or a different dir) filesystem in it for reusing
# in another live-initramfs session. Look at manpage for more info.
#
# and save the /live/cow (or a different dir) filesystem in it for reusing
# in another live-initramfs session. Look at manpage for more info.
#
@@
-36,7
+36,11
@@
export USERNAME USERFULLNAME HOSTNAME
PROGRAM="$(basename $0)"
VERSION=0.0.2
PROGRAM="$(basename $0)"
VERSION=0.0.2
-MOUNTP="/mnt/live-snapshot"
+# Needs to be available at run and reboot time
+SAFE_TMPDIR="/live"
+
+# Permits multiple runs
+MOUNTP="$(mktemp -d -p ${SAFE_TMPDIR} live-snapshot-mnt.XXXXXX)"
SNAP_COW="/live/cow"
SNAP_DEV=""
DEST="${MOUNTP}/live-sn.cpio.gz"
SNAP_COW="/live/cow"
SNAP_DEV=""
DEST="${MOUNTP}/live-sn.cpio.gz"
@@
-289,10
+293,13
@@
Do_snapshot ()
{
case "${SNAP_TYPE}" in
squashfs)
{
case "${SNAP_TYPE}" in
squashfs)
- echo "./tmp/exclude_list" > /tmp/exclude_list
- ( cd "${SNAP_COW}" && find . -name '*.wh.*' >> /tmp/exclude_list )
- mksquashfs "${SNAP_COW}" "${DEST}" -ef /tmp/exclude_list
- rm /tmp/exclude_list
+ EXCLUDE_LIST="$(mktemp -p ${SAFE_TMPDIR} live-snapshot-exclude-list.XXXXXX)"
+ echo "./${EXCLUDE_LIST}" > "${EXCLUDE_LIST}"
+ cd "${SNAP_COW}"
+ find . -name '*.wh.*' >> "${EXCLUDE_LIST}"
+ cd "${OLDPWD}"
+ mksquashfs "${SNAP_COW}" "${DEST}" -ef "${EXCLUDE_LIST}"
+ rm -f "${EXCLUDE_LIST}"
;;
cpio)
;;
cpio)