Merge ~mwhudson/casper:additional-iso-url into casper:main

[Michael Hudson-Doyle]

support iso-url= as a synonym for url=

This is so the user can use a command line argument that is not also
interpreted by cloud-init.

[Dan Bungert (dbungert)]

Thanks for doing this, this will really help netboot.
We should update debian/manpage/casper.7

review: Needs Fixing

[Michael Hudson-Doyle (mwhudson)]

Good catch, done.

[Dan Bungert (dbungert)]

review: Approve

diff --git a/debian/manpage/casper.7 b/debian/manpage/casper.7
index 3ee0629..780c5e4 100644
--- a/debian/manpage/casper.7
+++ b/debian/manpage/casper.7
@@ -52,9 +52,9 @@ Configure the running locale as specified, if not present the live-media rootfs 
 Add a ubiquity hook to install driver-updates to the target system.
 .TP
 .BR "netboot[=" nfs "|" cifs "|" url ]
-This tells casper to perform a network mount. The parameter "nfsroot=" (with optional "nfsopts="), should specify where is the location of the root filesystem.  With no args, will try cifs first, and if it fails nfs. If url method is chosen, "url=" parameter should point to the location of the ".iso" that will be downloaded and mounted. Note "url=" on the commandline alone, by default sets "netboot=url" method too.
+This tells casper to perform a network mount. The parameter "nfsroot=" (with optional "nfsopts="), should specify where is the location of the root filesystem.  With no args, will try cifs first, and if it fails nfs. If url method is chosen, "iso-url=" parameter should point to the location of the ".iso" that will be downloaded and mounted. Note "iso-url=" on the commandline alone, by default sets "netboot=url" method too.
 .TP
-.BI preseed/url|url= URL
+.BI iso-url|url= URL
 This tells casper the download location of the installer ISO. The ISO will be downloaded and mounted. Networking is required for this option to work, which can be configured with "ip=" option. Note, setting this option, will also set "netboot=url" method.
 .TP
 .B persistent
diff --git a/scripts/casper b/scripts/casper
index cd4a76c..a048f9a 100644
--- a/scripts/casper
+++ b/scripts/casper
@@ -49,6 +49,9 @@ parse_cmdline() {
             url=*.iso)
                 export NETBOOT=url
                 export URL="${x#url=}" ;;
+            iso-url=*.iso)
+                export NETBOOT=url
+                export URL="${x#iso-url=}" ;;
             uuid=*)
                 UUID=${x#uuid=} ;;
             ignore_uuid)