From f5518de7325206a4ccdc74026cfbc35d8adeed37 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Sat, 13 Dec 2014 16:53:06 -0300 Subject: [archiso] Merge cowspace_size= option in cowfile_size= Since now cowspace_size == cowfile_size (only one file inside) Signed-off-by: Gerardo Exequiel Pozzi --- archiso/initcpio/hooks/archiso | 5 ++--- docs/README.bootparams | 7 +------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/archiso/initcpio/hooks/archiso b/archiso/initcpio/hooks/archiso index 8b90185..addd08a 100644 --- a/archiso/initcpio/hooks/archiso +++ b/archiso/initcpio/hooks/archiso @@ -96,7 +96,6 @@ _verify_checksum() { run_hook() { [[ -z "${arch}" ]] && arch="$(uname -m)" - [[ -z "${cowspace_size}" ]] && cowspace_size="75%" [[ -z "${copytoram_size}" ]] && copytoram_size="75%" [[ -z "${archisobasedir}" ]] && archisobasedir="arch" [[ -z "${dm_snap_prefix}" ]] && dm_snap_prefix="arch" @@ -160,9 +159,9 @@ archiso_mount_handler() { echo $(readlink -f ${cow_device}) >> /run/archiso/used_block_devices mount -o remount,rw "/run/archiso/cowspace" else - msg ":: Mounting /run/archiso/cowspace (tmpfs) filesystem, size=${cowspace_size}..." + msg ":: Mounting /run/archiso/cowspace (tmpfs) filesystem, size=${cowfile_size}..." mkdir -p /run/archiso/cowspace - mount -t tmpfs -o "size=${cowspace_size}",mode=0755 cowspace /run/archiso/cowspace + mount -t tmpfs -o "size=${cowfile_size}",mode=0755 cowspace /run/archiso/cowspace fi mkdir -p "/run/archiso/cowspace/${cow_directory}" diff --git a/docs/README.bootparams b/docs/README.bootparams index c974755..ca3db35 100644 --- a/docs/README.bootparams +++ b/docs/README.bootparams @@ -40,14 +40,9 @@ INDEX Default: "/persistent_${archisolabel}/${arch}" * cow_persistent= Set if snapshot is persistent "P" or non-persistent "N". Default: "N" (if no ${cow_device} is used) otherwise "P". -* cowspace_size= Set the size of tmpfs /cowspace. This space is used for - Copy-On-Write files of dm-snapshot. - Size is in bytes (suffix with "k", "m" and "g") or - in percentage of available RAM. - Default: "75%" * cowfile_size= Set the size for COW file (dm-snapshot). The argument is an integer and optional unit. - Units are M,G (powers of 1024) or MB,GB (powers of 1000). + Units are M,G (powers of 1024). Default: "256M" * copytoram_size= Set the size of tmpfs. This space is used for airootfs.sfs image if copytoram=y. -- cgit v1.2.3-70-g09d2