projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding missing pipe in cryptsetup call for persistency on luks partitions.
[live-boot-grml.git]
/
scripts
/
live
diff --git
a/scripts/live
b/scripts/live
index
683afa2
..
f33ece7
100755
(executable)
--- a/
scripts/live
+++ b/
scripts/live
@@
-927,7
+927,7
@@
find_snap ()
if [ "${PERSISTENT}" != "nofiles" ]
then
# search for image files
if [ "${PERSISTENT}" != "nofiles" ]
then
# search for image files
- snapdata=$(find_files "${snap_label}.squashfs ${snap_label}.cpio.gz ${snap_label}.ext2 ${snap_label}.ext3 ${sna
l
_label}.ext4 ${snap_label}.jffs2")
+ snapdata=$(find_files "${snap_label}.squashfs ${snap_label}.cpio.gz ${snap_label}.ext2 ${snap_label}.ext3 ${sna
p
_label}.ext4 ${snap_label}.jffs2")
fi
if [ -z "${snapdata}" ]
fi
if [ -z "${snapdata}" ]
@@
-1286,6
+1286,9
@@
setup_unionfs ()
${rootmnt} failed with option noatime,dirs=/cow=rw:${rofsstring}"
fi
${rootmnt} failed with option noatime,dirs=/cow=rw:${rofsstring}"
fi
+ # Correct the permissions of /:
+ chmod 0755 "${rootmnt}"
+
# tmpfs file systems
touch /etc/fstab
mkdir -p "${rootmnt}/live"
# tmpfs file systems
touch /etc/fstab
mkdir -p "${rootmnt}/live"
@@
-1408,7
+1411,8
@@
find_livefs ()
do
if [ "$(cat ${sysblock}/removable)" = "1" ]
then
do
if [ "$(cat ${sysblock}/removable)" = "1" ]
then
- if readlink ${sysblock}/device | grep -q usb
+ if readlink ${sysblock} | grep -q usb ||
+ readlink ${sysblock}/device | grep -q usb # linux < 2.6.29
then
for dev in $(subdevices "${sysblock}")
do
then
for dev in $(subdevices "${sysblock}")
do