faerbit/archiso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[archiso] Merge cowspace_size= option in cowfile_size=

Browse Source 
Since now cowspace_size == cowfile_size (only one file inside)

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@gmail.com>
This commit is contained in:
Gerardo Exequiel Pozzi 2014-12-13 16:53:06 -03:00
parent abe198a73a
commit f5518de732
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
archiso/initcpio/hooks/archiso
View File

@ -96,7 +96,6 @@ _verify_checksum() {
run_hook() { run_hook() {
[[ -z "${arch}" ]] && arch="$(uname -m)" [[ -z "${arch}" ]] && arch="$(uname -m)"
[[ -z "${cowspace_size}" ]] && cowspace_size="75%"
[[ -z "${copytoram_size}" ]] && copytoram_size="75%" [[ -z "${copytoram_size}" ]] && copytoram_size="75%"
[[ -z "${archisobasedir}" ]] && archisobasedir="arch" [[ -z "${archisobasedir}" ]] && archisobasedir="arch"
[[ -z "${dm_snap_prefix}" ]] && dm_snap_prefix="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 echo $(readlink -f ${cow_device}) >> /run/archiso/used_block_devices
mount -o remount,rw "/run/archiso/cowspace" mount -o remount,rw "/run/archiso/cowspace"
else 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 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 fi
mkdir -p "/run/archiso/cowspace/${cow_directory}" mkdir -p "/run/archiso/cowspace/${cow_directory}"

7
docs/README.bootparams
View File

@ -40,14 +40,9 @@ INDEX
Default: "/persistent_${archisolabel}/${arch}" Default: "/persistent_${archisolabel}/${arch}"
* cow_persistent= Set if snapshot is persistent "P" or non-persistent "N". * cow_persistent= Set if snapshot is persistent "P" or non-persistent "N".
Default: "N" (if no ${cow_device} is used) otherwise "P". 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). * cowfile_size= Set the size for COW file (dm-snapshot).
The argument is an integer and optional unit. 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" Default: "256M"
* copytoram_size= Set the size of tmpfs. This space is used for * copytoram_size= Set the size of tmpfs. This space is used for
airootfs.sfs image if copytoram=y. airootfs.sfs image if copytoram=y.