Branch 'rhel6-branch' - docs/livecd-iso-to-disk.pod tools/livecd-iso-to-disk.sh

[Brian C. Lane]

 docs/livecd-iso-to-disk.pod |    4 ++--
 tools/livecd-iso-to-disk.sh |   12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 82ea9d39534295be211d4ac1d9880bed985dab4a
Author: Brian C. Lane <bcl(a)redhat.com&gt;
Date:   Mon Apr 7 10:04:28 2014 -0700

    Change vfat limit from 2047 to 4095
    
    This is a backport of commit 16b6c36202f5a78.
    
    The actual filesystem limit is 2^32−1

diff --git a/docs/livecd-iso-to-disk.pod b/docs/livecd-iso-to-disk.pod
index 1ccab66..4ddef23 100644
--- a/docs/livecd-iso-to-disk.pod
+++ b/docs/livecd-iso-to-disk.pod
@@ -32,11 +32,11 @@ Disables the image validation process which occurs before the image is
installed
 
 =item --overlay-size-mb
 
-This option sets the overlay size in megabytes. The overlay is additional storage
available to the live operating system if the operating system supports it. The USB
storage device must have enough free space for the image and the overlay.
+This option sets the overlay size in mebibytes (integer values only).  The overlay makes
persistent storage available to the live operating system, if the operating system
supports it.  The persistent LiveOS overlay holds image-change snapshots (using
write-once, difference-tracking  storage) in the /LiveOS/overlay-<device_id> file,
which, *one should note*, always grows in size due to the storage mechanism.  (The
fraction of allocated space that has been consumed may be displayed by issuing the
'dmsetup status' command in a terminal session of a running LiveOS installation.) 
One way to conserve the unrecoverable, overlay file space, is to specify a persistent home
folder for user files, see --home-size-mb below.  The target storage device must have
enough free space for the image and the overlay.  A maximum <size> of 4095 MiB is
permitted for vfat-formatted devices.  If there is insufficient room on your device, you
will be given information to help in adjusting your setti
 ngs.
 
 =item --home-size-mb
 
-Sets the home directory size in megabytes.
+Sets the home directory size in mebibytes (integer values only).  A persistent home
directory will be made in the /LiveOS/home.img filesystem image file.  This file space is
encrypted by default, but not compressed (one may bypass encryption with the
--unencrypted-home installation option).  Files in this home folder may be erased to
recover and reuse their storage space.  The target storage device must have enough free
space for the image, any overlay, and the home directory.  Note that the --delete-home
option must also be selected to replace an existing persistent home with a new, empty one.
 A maximum <size> of 4095 MiB is permitted for vfat-formatted devices.  If there is
insufficient room on your device, you will be given information to help in adjusting your
settings.
 
 =item --unencrypted-home
 
diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index 3e149d7..eb7be61 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -560,22 +560,22 @@ checkMBR $USBDEV
 
 
 if [ "$overlaysizemb" -gt 0 -a "$USBFS" = "vfat" ]; then
-    if [ "$overlaysizemb" -gt 2047 ]; then
-        echo "Can't have an overlay of 2048MB or greater on VFAT"
+    if [ "$overlaysizemb" -gt 4095 ]; then
+        echo "Can't have an overlay of 4095MB or greater on VFAT"
         exitclean
     fi
 fi
 
 if [ "$homesizemb" -gt 0 -a "$USBFS" = "vfat" ]; then
-    if [ "$homesizemb" -gt 2047 ]; then
-        echo "Can't have a home overlay greater than 2048MB on VFAT"
+    if [ "$homesizemb" -gt 4095 ]; then
+        echo "Can't have a home overlay greater than 4095MB on VFAT"
         exitclean
     fi
 fi
 
 if [ "$swapsizemb" -gt 0 -a "$USBFS" = "vfat" ]; then
-    if [ "$swapsizemb" -gt 2047 ]; then
-        echo "Can't have a swap file greater than 2048MB on VFAT"
+    if [ "$swapsizemb" -gt 4095 ]; then
+        echo "Can't have a swap file greater than 4095MB on VFAT"
         exitclean
     fi
 fi

[ToddAndMargo]

On 04/07/2014 10:56 AM, Brian C. Lane wrote:
>    docs/livecd-iso-to-disk.pod |    4 ++--
>    tools/livecd-iso-to-disk.sh |   12 ++++++------
>    2 files changed, 8 insertions(+), 8 deletions(-)
>
>  New commits:
>  commit 82ea9d39534295be211d4ac1d9880bed985dab4a
>  Author: Brian C. Lane <bcl(a)redhat.com&gt;
>  Date:   Mon Apr 7 10:04:28 2014 -0700
>
>       Change vfat limit from 2047 to 4095
>
>       This is a backport of commit 16b6c36202f5a78.
>
>       The actual filesystem limit is 2^32−1 


$ rpm -qa \*livecd\*
livecd-tools-13.4.5-1.el6.x86_64

Hi Brian,

     Did you mean 4085 and not 4095?

     Do you know when this patch will be appearing in EPEL?
Will there be an announcement here?

Many thanks,
-T


-- 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Computers are like air conditioners.
They malfunction when you open windows
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

[Brian C. Lane]

On Mon, Apr 07, 2014 at 11:40:13AM -0700, ToddAndMargo wrote:
>  On 04/07/2014 10:56 AM, Brian C. Lane wrote:
>  >  docs/livecd-iso-to-disk.pod |    4 ++--
>  >  tools/livecd-iso-to-disk.sh |   12 ++++++------
>  >  2 files changed, 8 insertions(+), 8 deletions(-)
>  >
>  >New commits:
>  >commit 82ea9d39534295be211d4ac1d9880bed985dab4a
>  >Author: Brian C. Lane <bcl(a)redhat.com&gt;
>  >Date:   Mon Apr 7 10:04:28 2014 -0700
>  >
>  >     Change vfat limit from 2047 to 4095
>  >
>  >     This is a backport of commit 16b6c36202f5a78.
>  >
>  >     The actual filesystem limit is 2^32−1
>  
>  
>  
>  $ rpm -qa \*livecd\*
>  livecd-tools-13.4.5-1.el6.x86_64
>  
>  Hi Brian,
>  
>      Did you mean 4085 and not 4095? 
No, 4095 is correct.

>  
>      Do you know when this patch will be appearing in EPEL?
>  Will there be an announcement here? 
When I do a build. Probably today or tomorrow after I see if there is
anything else that needs to be added. You'll see a commit for the
rhel6-branch with a new NVR


-- 
Brian C. Lane | Anaconda Team | IRC: bcl #anaconda | Port Orchard, WA (PST8PDT)