projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Releasing debian version 3.0~a7-1.
[live-boot-grml.git]
/
debian
/
live-boot.init
diff --git
a/debian/live-boot.init
b/debian/live-boot.init
index
6c3e665
..
9d6bc69
100644
(file)
--- a/
debian/live-boot.init
+++ b/
debian/live-boot.init
@@
-49,7
+49,7
@@
cache_path()
then
if [ -x "${path}" ]
then
then
if [ -x "${path}" ]
then
- if file "${path}" | grep -q 'dynamically linked'
+ if file
-L
"${path}" | grep -q 'dynamically linked'
then
for lib in $(ldd "${path}" | awk '{ print $3 }')
do
then
for lib in $(ldd "${path}" | awk '{ print $3 }')
do
@@
-84,8
+84,7
@@
device_is_USB_flash_drive()
[ "$(expr substr ${DEVICE} 1 2)" != "sd" ] && return 1
# check that the device is an USB device
[ "$(expr substr ${DEVICE} 1 2)" != "sd" ] && return 1
# check that the device is an USB device
- if readlink /sys/block/${DEVICE} | grep -q usb ||
- readlink /sys/block/${DEVICE}/device | grep -q usb # linux < 2.6.29
+ if readlink /sys/block/${DEVICE} | grep -q usb
then
return 0
fi
then
return 0
fi
@@
-97,6
+96,7
@@
do_stop ()
{
if ! grep -qs nopersistent /proc/cmdline && grep -qs persistent /proc/cmdline
then
{
if ! grep -qs nopersistent /proc/cmdline && grep -qs persistent /proc/cmdline
then
+ # ROOTSNAP and HOMESNAP are defined in ${SNAPSHOT_CONF} file
if [ ! -z "${ROOTSNAP}" ]
then
${DO_SNAPSHOT} --resync-string="${ROOTSNAP}"
if [ ! -z "${ROOTSNAP}" ]
then
${DO_SNAPSHOT} --resync-string="${ROOTSNAP}"