Merge lp:~broder/ubuntu/natty/casper/fix-671786 into lp:ubuntu/natty/casper

[Evan Broder]

The one thing I'm a little unsure of is the interaction between the uuid= and ignore_uuid options. Right now the last option wins, which I think is the most reasonable thing to do, but I could be convinced otherwise.

[Colin Watson (cjwatson)]

Thanks for your patch. This approach (on parameter ordering) seems natural enough to me.

review: Approve

[Colin Watson (cjwatson)]

The one extra thing I'm going to do is to add an item of documentation to debian/manpage/casper.7. (This hasn't been done consistently in the past, so I won't delay merging your branch on it.)

=== modified file 'debian/changelog'
--- debian/changelog	2010-10-05 04:35:47 +0000
+++ debian/changelog	2010-11-06 10:24:51 +0000
@@ -1,3 +1,10 @@
+casper (1.249) natty; urgency=low
+
+  * scripts/casper: Check for uuid= command line parameter in addition to
+    /conf/uuid.conf file in initrd. (LP: #671786)
+
+ -- Evan Broder <[e-mail]>  Sat, 06 Nov 2010 03:18:57 -0700
+
 casper (1.248) maverick; urgency=low
 
   * ubiquity-hooks/30accessibility: Create .local/share subdirectory structure

=== modified file 'scripts/casper' (properties changed: -x to +x)
--- scripts/casper	2010-09-06 15:52:21 +0000
+++ scripts/casper	2010-11-06 10:24:51 +0000
@@ -6,6 +6,7 @@
 
 mountpoint=/cdrom
 LIVE_MEDIA_PATH=casper
+[ -f /conf/uuid.conf ] && UUID="$(cat /conf/uuid.conf)"
 
 root_persistence="casper-rw"
 home_persistence="home-rw"
@@ -48,8 +49,10 @@
                     STATICIP="frommedia"
                 fi
                 export STATICIP ;;
+            uuid=*)
+                UUID=${x#uuid=} ;;
             ignore_uuid)
-                IGNORE_UUID="Yes" ;;
+                UUID="" ;;
             live-media-path=*)
                 LIVE_MEDIA_PATH="${x#live-media-path=}"
                 export LIVE_MEDIA_PATH
@@ -78,15 +81,14 @@
 }
 
 matches_uuid() {
-    if [ "$IGNORE_UUID" ] || [ ! -e /conf/uuid.conf ]; then
+    if [ -z "$UUID" ]; then
         return 0
     fi
     path="$1"
-    uuid="$(cat /conf/uuid.conf)"
     for try_uuid_file in "$path/.disk/casper-uuid"*; do
         [ -e "$try_uuid_file" ] || continue
         try_uuid="$(cat "$try_uuid_file")"
-        if [ "$uuid" = "$try_uuid" ]; then
+        if [ "$UUID" = "$try_uuid" ]; then
             return 0
         fi
     done