projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed all "cat | grep", with grep, awk and sed.
[live-boot-grml.git]
/
scripts
/
live
diff --git
a/scripts/live
b/scripts/live
index
8761138
..
9c747d5
100755
(executable)
--- a/
scripts/live
+++ b/
scripts/live
@@
-613,7
+613,7
@@
copy_live_to ()
if [ "${copytodev}" = "ram" ]
then
# copying to ram:
if [ "${copytodev}" = "ram" ]
then
# copying to ram:
- freespace=$( expr $(awk '/MemFree/{print $2}' /proc/meminfo) + $(
cat /proc/meminfo | grep Cached | head -n 1 | awk '/Cached/{print $2}' -
) )
+ freespace=$( expr $(awk '/MemFree/{print $2}' /proc/meminfo) + $(
awk '/\<Cached/{print $2}' /proc/meminfo
) )
mount_options="-o size=${size}k"
free_string="memory"
fstype="tmpfs"
mount_options="-o size=${size}k"
free_string="memory"
fstype="tmpfs"
@@
-846,10
+846,10
@@
do_snap_copy ()
# look for free mem
if [ -n "${HOMEMOUNTED}" -a "${snap_type}" = "HOME" ]
then
# look for free mem
if [ -n "${HOMEMOUNTED}" -a "${snap_type}" = "HOME" ]
then
- todev=$(
cat /proc/mounts | grep -s " $(base_path ${todir}) " | awk '{print $1}'
)
- freespace=$(df -k
| grep -s ${todev} | awk '
{print $4}')
+ todev=$(
awk -v pat="$(base_path ${todir})" '$2 == pat { print $1 }' /proc/mounts
)
+ freespace=$(df -k
| awk '/'${todev}'/
{print $4}')
else
else
- freespace=$( expr $(awk '/MemFree/{print $2}' /proc/meminfo) + $(
cat /proc/meminfo | grep Cached | head -n 1 | awk '/Cached/{print $2}' -
))
+ freespace=$( expr $(awk '/MemFree/{print $2}' /proc/meminfo) + $(
awk '/\<Cached/{print $2}' /proc/meminfo
))
fi
tomount="/mnt/tmpsnap"
fi
tomount="/mnt/tmpsnap"
@@
-963,7
+963,7
@@
try_snap ()
# strange things happens, user confused?
snaploop=$( losetup ${dev} | awk '{print $3}' | tr -d '()' )
snapfile=$(basename ${snaploop})
# strange things happens, user confused?
snaploop=$( losetup ${dev} | awk '{print $3}' | tr -d '()' )
snapfile=$(basename ${snaploop})
- snapdev=$(
cat /proc/mounts | awk '{print $2,$1}' | grep -es "^$( dirname ${snaploop} )" | cut -f2 -d ' '
)
+ snapdev=$(
awk -v pat="$( dirname ${snaploop})" '$2 == pat { print $1 }' /proc/mounts
)
else
snapdev="${dev}"
fi
else
snapdev="${dev}"
fi
@@
-1151,11
+1151,20
@@
setup_unionfs ()
# snapshots to be sure to really store some e.g key config files,
# but not on the same media
blacklistdev="${cowprobe}"
# snapshots to be sure to really store some e.g key config files,
# but not on the same media
blacklistdev="${cowprobe}"
+ PERSISTENCE_IS_ON="1"
+ export PERSISTENCE_IS_ON
fi
# homecow just mount something on /home, this should be generalized some way
homecow=$(find_cow_device "${home_persistence}" "${blacklistdev}")
fi
# homecow just mount something on /home, this should be generalized some way
homecow=$(find_cow_device "${home_persistence}" "${blacklistdev}")
+ if [ -b "${homecow}" ]
+ then
+ PERSISTENCE_IS_ON="1"
+ export PERSISTENCE_IS_ON
+ fi
root_snapdata=$(find_snap "${root_snapshot_label}" "${blacklistdev}")
root_snapdata=$(find_snap "${root_snapshot_label}" "${blacklistdev}")
- # This second type should be removed when snapshot grow smarter
+ # This second type should be removed when snapshot will get smarter,
+ # hence when "/etc/live-snapshot*list" will be supported also by
+ # ext2|ext3|jffs2 snapshot types.
home_snapdata=$(find_snap "${home_snapshot_label}" "${blacklistdev}")
if [ -b "${cowprobe}" ]
home_snapdata=$(find_snap "${home_snapshot_label}" "${blacklistdev}")
if [ -b "${cowprobe}" ]