Branch 'f18-branch' - 3 commits - docs/livecd-iso-to-disk.pod Makefile tools/livecd-iso-to-disk.sh

[Brian C. Lane]

 Makefile                    |    2 +-
 docs/livecd-iso-to-disk.pod |   10 +++++++++-
 tools/livecd-iso-to-disk.sh |   30 ++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 2 deletions(-)

New commits:
commit 07b8a52a0888536306dd849a9c00fc2a9a2ed5b2
Author: Brian C. Lane <bcl(a)redhat.com&gt;
Date:   Mon Jul 15 11:41:12 2013 -0700

    Version 18.17

diff --git a/Makefile b/Makefile
index ccd1bd4..aabfeab 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 
-VERSION = 18.16
+VERSION = 18.17
 
 INSTALL = /usr/bin/install -c
 INSTALL_PROGRAM = ${INSTALL}


commit 0bc0f31c803b15d175e1fe9745ecb38e85bb435f
Author: Brian C. Lane <bcl(a)redhat.com&gt;
Date:   Mon Jul 15 11:15:11 2013 -0700

    litd: Add kickstart option
    
    Add --ks kickstart option to copy a kickstart to the USB and setup
    inst.ks to point to it. This can be used with a netboot or dvd iso to
    make a USB stick that will start an install on boot.
    
    Note that with the F19 release the install USB is not filtered out of
    the drive list so clearpart --drives=sda needs to be used in the ks.

diff --git a/docs/livecd-iso-to-disk.pod b/docs/livecd-iso-to-disk.pod
index 8f9ed61..bf52822 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] [--updates updates.img] <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] [--ks kickstart] <source> <target
device>
 
 Simplest
 
@@ -139,6 +139,10 @@ Prevents the default option to encrypt a new persistent home
directory.
 
 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.
 
+=item --ks kickstart
+
+Setup inst.ks to point to an kickstart file on the device. Use this for automating
installs on boot.
+
 =back
 
 =head1 CONTRIBUTORS
diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index 9a8103b..9387b39 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -35,7 +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]
+                       [--updates updates.img] [--ks kickstart]
                        <source> <target device>
 
     (Enter livecd-iso-to-disk --help on the command line for more information.)"
@@ -249,6 +249,10 @@ usage() {
         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.
 
+    --ks kickstart
+        Setup inst.ks to point to an kickstart file on the device. Use this for
+        automating installs on boot.
+
     CONTRIBUTORS
 
     livecd-iso-to-disk: David Zeuthen, Jeremy Katz, Douglas McClendon,
@@ -708,6 +712,7 @@ packages=
 LIVEOS=LiveOS
 HOMEFILE="home.img"
 updates=
+ks=
 
 if [[ "$*" =~ "--help" ]]; then
     usage
@@ -800,6 +805,10 @@ while [ $# -gt 2 ]; do
             updates=$2
             shift
             ;;
+        --ks)
+            ks=$2
+            shift
+            ;;
         *)
             echo "invalid arg -- $1"
             shortusage
@@ -1203,6 +1212,12 @@ if [ -n "$updates" ]; then
     kernelargs+=" inst.updates=hd:$TGTLABEL:/updates.img"
 fi
 
+# Setup the kickstart
+if [ -n "$ks" ]; then
+    copyFile "$ks" "$TGTMNT/ks.cfg"
+    kernelargs+=" inst.ks=hd:$TGTLABEL:/ks.cfg"
+fi
+
 echo "Updating boot config file"
 # adjust label and fstype
 sed -i -e "s/CDLABEL=[^ ]*/$TGTLABEL/" -e "s/rootfstype=[^
]*/rootfstype=$TGTFS/" -e "s/LABEL=[^ ]*/$TGTLABEL/" $BOOTCONFIG 
$BOOTCONFIG_EFI


commit 9bdfcfe38b400d0ebc4e9db83be6907e5238b83d
Author: Brian C. Lane <bcl(a)redhat.com&gt;
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 eb7c3cc..9a8103b 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
@@ -1187,6 +1197,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