Merge lp:~fernandezm/ubuntu/utopic/casper/toram-casper into lp:ubuntu/utopic/casper

[Marcelo Fernandez]

Adding a new cmdline parameter called 'toram-casper', which allows to copy just one casper directory to RAM when using toram option. This is useful when you have multiple casper directories in your media, supporting different squashfs environments (i.e., to support different hardware in the same ISO).

For example, look at this isolinux.cfg:

LABEL platform1
  kernel /casper_platform1/vmlinuz
  append file=/cdrom/preseed/ubuntu.seed boot=casper initrd=/casper_platform1/initrd.lz live-media-path=/casper_platform1 toram toram-casper=casper_platform1
LABEL platform2
  kernel /casper_platform2/vmlinuz
  append file=/cdrom/preseed/ubuntu.seed boot=casper initrd=/casper_platform2/initrd.lz live-media-path=/casper_platform2 toram toram-casper=casper_platform2

With this patch, casper will copy to the system RAM only the adequate "casper_platform" directory and not everything in the media. This is useful when you have a 4GB DVD ISO with different "casper_platform" directories and you have a 1GB RAM machine.

[Luke Yelavich (themuso)]

Thanks for your work.
I am not currently in a position to test this fix to make sure it still works in all use cases, but code wise it looks ok. I would ask that you add a debian/changelog entry, and explain clearly what this change is, and why it is being made, i.e something similar to what you wrote in the merge proposal message. Your bzr log message could be used, but it is not detailed enough as to the change, and why it is being made.

Thanks again.

review: Needs Fixing

[lp:~fernandezm/ubuntu/utopic/casper/toram-casper]

1137. By Marcelo Fernandez on 2014-06-06

Adding debian/changelog.

[Marcelo Fernandez (fernandezm)]

Thanks Luke, now I've pushed the debian/changelog entry, I hope it gets merged. :-)

Let me know if there's anything else left to do.

Regards

Unmerged revisions

1137. By Marcelo Fernandez on 2014-06-06

Adding debian/changelog.

1136. By Marcelo Fernandez on 2014-05-09

Added toram-casper cmdline option to copy only one casper directory (not everything) from the media to RAM

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-09 18:47:09 +0000
+++ debian/changelog	2014-06-06 16:03:40 +0000
@@ -1,3 +1,17 @@
+casper (1.341) utopic; urgency=low
+
+  * scripts/casper: Adding a new cmdline parameter called 'toram-casper', which
+    allows to copy just one casper directory to RAM when using toram option.
+    This is useful when you have multiple casper directories in your media,
+    supporting different squashfs environments (i.e., to support different
+    hardware or different linux distributions in the same ISO).
+    With this patch, casper will copy to the system RAM only the adequate
+    "casper_platform" directory and not everything in the media.
+    A good use case is when you don't have enough memory to load the different
+    casper_platforms included in a ISO, and you will only use one.
+
+ -- Marcelo Fernández <[e-mail]>  Fri, 06 Jun 2014 12:44 -0300
+
 casper (1.340) trusty; urgency=medium
 
   * Remove 23etc_modules which does more harm than good (LP: #1296386)

=== modified file 'scripts/casper'
--- scripts/casper	2014-03-19 14:22:36 +0000
+++ scripts/casper	2014-06-06 16:03:40 +0000
@@ -63,6 +63,9 @@
                 echo "export LIVE_MEDIA_PATH=\"$LIVE_MEDIA_PATH\"" >> /etc/casper.conf ;;
             toram)
                 export TORAM="Yes" ;;
+            toram-casper=*)
+                TORAM_CASPER="${x#toram-casper=}"
+                export TORAM_CASPER ;;
             todisk=*)
                 export TODISK="${x#todisk=}" ;;
             hostname=*)
@@ -159,6 +162,20 @@
 
     size=$(fs_size "" ${copyfrom} "used")
 
+    # If booting with a defined toram-casper variable, deduct from the total
+    # media size the 'casper_' directories we won't copy to RAM
+    if [ ! -z "${TORAM_CASPER}" ]; then
+        for dir in $(ls -A ${copyfrom}/); do
+            case "$dir" in
+                casper_*)
+                    if [ "$dir" != "${TORAM_CASPER}" ]; then
+                        size_casper=$(du -ks ${copyfrom}/$dir | cut -f1)
+                        size=$(expr ${size} - ${size_casper})
+                    fi ;;
+            esac
+        done
+    fi 
+
     if [ "${copytodev}" = "ram" ]; then
         # copying to ram:
         freespace=$(awk '/^MemFree:/{f=$2} /^Cached:/{c=$2} END{print f+c}' /proc/meminfo)
@@ -187,9 +204,25 @@
     mkdir "${copyto}"
     echo "mount -t ${fstype} ${mount_options} ${dev} ${copyto}"
     mount -t "${fstype}" ${mount_options} "${dev}" "${copyto}"
-    cp -a ${copyfrom}/* ${copyto}
-    if [ -e ${copyfrom}/.disk ]; then
-        cp -a ${copyfrom}/.disk ${copyto}
+    # If booting without a defined toram-casper variable, use the original copy-all
+    if [ -z "${TORAM_CASPER}" ]; then
+        cp -a ${copyfrom}/* ${copyto}
+        if [ -e ${copyfrom}/.disk ]; then
+            cp -a ${copyfrom}/.disk ${copyto}
+        fi
+    else
+        # Partial copy to RAM; copy all directories from the media, but for those
+        # starting with 'casper_', we will copy only the directory matching
+        # $TORAM_CASPER variable.
+        for dir in $(ls -A ${copyfrom}/); do
+            case "$dir" in
+                casper_*)
+                    if [ "$dir" == "${TORAM_CASPER}" ]; then
+                        cp -a ${copyfrom}/$dir ${copyto}
+                    fi ;;
+                *) cp -a ${copyfrom}/$dir ${copyto} ;;
+            esac
+        done
     fi
     umount ${copyfrom}
     mount -r -o move ${copyto} ${copyfrom}