[Fedora-livecd-list] docs/livecd-iso-to-disk.pod tools/livecd-iso-to-disk.sh

[Brian C. Lane]

 docs/livecd-iso-to-disk.pod |    6 +++++-
 tools/livecd-iso-to-disk.sh |   15 +++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit e0e2955812165a0eb993593aedce1f9186937e6f
Author: Brian C. Lane <bcl at redhat.com>
Date:   Fri Jun 7 12:14:15 2013 -0700

    litd: Add --updates option
    
    Pass --updates updates.img to livecd-iso-to-disk to setup an Anaconda
    updates image on the device. It copies the file over to /updates.img and
    adds inst.updates= to the kernel cmdline

diff --git a/docs/livecd-iso-to-disk.pod b/docs/livecd-iso-to-disk.pod
index 7ef0c14..8f9ed61 100644
--- a/docs/livecd-iso-to-disk.pod
+++ b/docs/livecd-iso-to-disk.pod
@@ -6,7 +6,7 @@ livecd-iso-to-disk - installs bootable Live images onto USB/SD storage devices.
 
 =head1 SYNOPSIS
 
-B<livecd-iso-to-disk>  [--help] [--noverify] [--format] [--reset-mbr] [--efi] [--skipcopy] [--force] [--xo] [--xo-no-home] [--timeout <time>] [--totaltimeout <time>] [--extra-kernel-args <args>] [--multi] [--livedir <dir>] [--compress] [--skipcompress] [--swap-size-mb <size>] [--overlay-size-mb <size>] [--home-size-mb <size>] [--delete-home] [--crypted-home] [--unencrypted-home] <source> <target device>
+B<livecd-iso-to-disk>  [--help] [--noverify] [--format] [--reset-mbr] [--efi] [--skipcopy] [--force] [--xo] [--xo-no-home] [--timeout <time>] [--totaltimeout <time>] [--extra-kernel-args <args>] [--multi] [--livedir <dir>] [--compress] [--skipcompress] [--swap-size-mb <size>] [--overlay-size-mb <size>] [--home-size-mb <size>] [--delete-home] [--crypted-home] [--unencrypted-home] [--updates updates.img] <source> <target device>
 
 Simplest
 
@@ -135,6 +135,10 @@ Specifies the default option to encrypt a new persistent home directory if --hom
 
 Prevents the default option to encrypt a new persistent home directory.
 
+=item --updates updates.img
+
+Setup inst.updates to point to an updates image on the device. Anaconda uses this for testing updates to an iso without needing to make a new iso.
+
 =back
 
 =head1 CONTRIBUTORS
diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index 23612ea..c4fb4db 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -35,6 +35,7 @@ shortusage() {
                        [--compress] [--skipcompress] [--swap-size-mb <size>]
                        [--overlay-size-mb <size>] [--home-size-mb <size>]
                        [--delete-home] [--crypted-home] [--unencrypted-home]
+                       [--updates updates.img]
                        <source> <target device>
 
     (Enter livecd-iso-to-disk --help on the command line for more information.)"
@@ -244,6 +245,10 @@ usage() {
     --unencrypted-home
         Prevents the default option to encrypt a new persistent home directory.
 
+    --updates updates.img
+        Setup inst.updates to point to an updates image on the device. Anaconda
+        uses this for testing updates to an iso without needing to make a new iso.
+
     CONTRIBUTORS
 
     livecd-iso-to-disk: David Zeuthen, Jeremy Katz, Douglas McClendon,
@@ -702,6 +707,7 @@ imgtype=
 packages=
 LIVEOS=LiveOS
 HOMEFILE="home.img"
+updates=
 
 if [[ "$*" =~ "--help" ]]; then
     usage
@@ -790,6 +796,10 @@ while [ $# -gt 2 ]; do
         --delete-home)
             keephome=""
             ;;
+        --updates)
+            updates=$2
+            shift
+            ;;
         *)
             echo "invalid arg -- $1"
             shortusage
@@ -1186,6 +1196,11 @@ if [ "$srctype" = "live" ]; then
     fi
 fi
 
+# Setup the updates.img
+if [ -n "$updates" ]; then
+    copyFile "$updates" "$TGTMNT/updates.img"
+    kernelargs+=" inst.updates=hd:$TGTLABEL:/updates.img"
+fi
 
 echo "Updating boot config file"
 # adjust label and fstype