[Fedora-livecd-list] Branch 'f19-branch' - docs/livecd-iso-to-disk.pod tools/livecd-iso-to-disk.sh
Brian C. Lane
bcl at fedoraproject.org
Mon Aug 12 17:37:47 UTC 2013
docs/livecd-iso-to-disk.pod | 4 ++--
tools/livecd-iso-to-disk.sh | 20 ++++++++++----------
2 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit caaff7b024aa8a9105825b085ae73d0c1642729b
Author: Brian C. Lane <bcl at redhat.com>
Date: Mon Aug 12 10:31:51 2013 -0700
Change vfat limit from 2047 to 4095 (#995552)
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 bf52822..cef973f 100644
--- a/docs/livecd-iso-to-disk.pod
+++ b/docs/livecd-iso-to-disk.pod
@@ -117,11 +117,11 @@ Sets up a swap file of <size> mebibytes (integer values only) on the target devi
=item --overlay-size-mb <size>
-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 2047 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.
+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 <size>
-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 2047 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.
+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 --delete-home
diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index b0b5153..b38e3b2 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -214,7 +214,7 @@ usage() {
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 2047 MiB is
+ 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
settings.
@@ -229,7 +229,7 @@ usage() {
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 2047 MiB is permitted for vfat-formatted devices. If there is
+ <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.
@@ -897,8 +897,8 @@ checkMBR $TGTDEV
if [ "$overlaysizemb" -gt 0 ]; then
- if [ "$TGTFS" = "vfat" -a "$overlaysizemb" -gt 2047 ]; then
- echo "Can't have an overlay of 2048MB or greater on VFAT"
+ if [ "$TGTFS" = "vfat" -a "$overlaysizemb" -gt 4095 ]; then
+ echo "Can't have an overlay of 4095MB or greater on VFAT"
exitclean
fi
LABEL=$(/sbin/blkid -s LABEL -o value $TGTDEV)
@@ -910,15 +910,15 @@ if [ "$overlaysizemb" -gt 0 ]; then
fi
if [ "$homesizemb" -gt 0 -a "$TGTFS" = "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 "$TGTFS" = "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
@@ -968,9 +968,9 @@ if [[ -n $skipcompress ]] && [[ -s $SRCMNT/LiveOS/squashfs.img ]]; then
if mount -o loop $SRCMNT/LiveOS/squashfs.img $SRCMNT; then
livesize=($(du -B 1M --apparent-size $SRCMNT/LiveOS/ext3fs.img))
umount $SRCMNT
- if ((livesize > 2048)) && [[ vfat == $TGTFS ]]; then
+ if ((livesize > 4095)) && [[ vfat == $TGTFS ]]; then
echo "
- An uncompressed image size greater than 2048 MB is not suitable
+ An uncompressed image size greater than 4095 MB is not suitable
for a VFAT-formatted device. The compressed SquashFS will be
copied to the target device.
"
More information about the livecd
mailing list