diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-05-01 13:47:42 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:48:09 +0100 |
| commit | 72fbca18c2b60dc498d43363ffb5903ee59d7892 (patch) | |
| tree | e0294399fc448fab2f525fb5bbf39451a2a3bf8a | |
| parent | 98479be56a79f58cafcaf65a3db2c06601ecd693 (diff) | |
| download | live-boot-72fbca18c2b60dc498d43363ffb5903ee59d7892.tar.gz live-boot-72fbca18c2b60dc498d43363ffb5903ee59d7892.zip | |
Merging casper 1.220.
| -rw-r--r-- | docs/ChangeLog.casper | 7 | ||||
| -rwxr-xr-x | scripts/live | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper index 3bdf715..1540603 100644 --- a/docs/ChangeLog.casper +++ b/docs/ChangeLog.casper @@ -1,3 +1,10 @@ +casper (1.220) lucid; urgency=low + + * scripts/casper: calculate memory without "head" utility, thanks to + Petar Bogdanovic (LP: #25496). + + -- Kees Cook <kees@ubuntu.com> Fri, 19 Feb 2010 14:04:18 -0800 + casper (1.219) lucid; urgency=low [ Mario Limonciello ] diff --git a/scripts/live b/scripts/live index 110f41d..cdcbc18 100755 --- a/scripts/live +++ b/scripts/live @@ -705,7 +705,7 @@ copy_live_to () if [ "${copytodev}" = "ram" ] then # copying to ram: - freespace=$( expr $(awk '/MemFree/{print $2}' /proc/meminfo) + $( awk '/\<Cached/{print $2}' /proc/meminfo ) ) + freespace=$(awk '/^MemFree:/{f=$2} /^Cached:/{c=$2} END{print f+c}' /proc/meminfo) mount_options="-o size=${size}k" free_string="memory" fstype="tmpfs" @@ -1008,7 +1008,7 @@ do_snap_copy () todev=$(awk -v pat="$(base_path ${todir})" '$2 == pat { print $1 }' /proc/mounts) freespace=$(df -k | awk '/'${todev}'/{print $4}') else - freespace=$( expr $(awk '/MemFree/{print $2}' /proc/meminfo) + $( awk '/\<Cached/{print $2}' /proc/meminfo)) + freespace=$(awk '/^MemFree:/{f=$2} /^Cached:/{c=$2} END{print f+c}' /proc/meminfo) fi tomount="/mnt/tmpsnap" |