diff --git a/initcpio/hooks/miso b/initcpio/hooks/miso index e4b1d1d..99b1352 100644 --- a/initcpio/hooks/miso +++ b/initcpio/hooks/miso @@ -41,8 +41,8 @@ _mnt_overlayfs() { local src="${1}" local newroot="${2}" local mnt="${3}" - local work_dir="/run/miso/cowspace/work" - local upper_dir="/run/miso/cowspace/upper" + local work_dir="/run/miso/overlay_root/work" + local upper_dir="/run/miso/overlay_root/upper" mkdir -p "${upper_dir}" "${work_dir}" @@ -124,6 +124,7 @@ run_hook() { [[ -z "${dm_snap_prefix}" ]] && dm_snap_prefix="arch" [[ -z "${misodevice}" ]] && misodevice="/dev/disk/by-label/${misolabel}" [[ -z "${cow_spacesize}" ]] && cow_spacesize="256M" + [[ -z "${overlay_root_size}" ]] && overlay_root_size="75%" if [[ -n "${cow_label}" ]]; then cow_device="/dev/disk/by-label/${cow_label}" @@ -207,6 +208,11 @@ miso_mount_handler() { fi mkdir -p -m 0700 "/run/miso/cowspace/${cow_directory}" + rw_branch_size="75%" + msg -n ":: Mounting overlay root (tmpfs) filesystem, size=${overlay_root_size}..." + mkdir -p /run/miso/overlay_root + mount -t tmpfs -o "size=${rw_branch_size}",mode=0755 overlay_root /run/miso/overlay_root + local src="/run/miso/bootmnt/${misobasedir}/${arch}" local dest_sfs="/run/miso/sfs" dest_img="/run/miso/img" local lower_dir diff --git a/initcpio/hooks/miso_aufs b/initcpio/hooks/miso_aufs index 8f20d92..32d7ae6 100644 --- a/initcpio/hooks/miso_aufs +++ b/initcpio/hooks/miso_aufs @@ -129,6 +129,7 @@ run_hook() { [[ -z "${dm_snap_prefix}" ]] && dm_snap_prefix="arch" [[ -z "${misodevice}" ]] && misodevice="/dev/disk/by-label/${misolabel}" [[ -z "${cow_spacesize}" ]] && cow_spacesize="256M" + [[ -z "${overlay_root_size}" ]] && overlay_root_size="75%" if [[ -n "${cow_label}" ]]; then cow_device="/dev/disk/by-label/${cow_label}" @@ -212,7 +213,11 @@ miso_mount_handler() { fi mkdir -p -m 0700 "/run/miso/cowspace/${cow_directory}" - local work_dir="/run/miso/cowspace" + msg -n ":: Mounting overlay root (tmpfs) filesystem, size=${overlay_root_size}..." + mkdir -p /run/miso/overlay_root + mount -t tmpfs -o "size=${overlay_root_size}",mode=0755 overlay_root /run/miso/overlay_root + + local work_dir="/run/miso/overlay_root" _mnt_overlayfs_root "${work_dir}" "${newroot}" "/" local src="/run/miso/bootmnt/${misobasedir}/${arch}" diff --git a/initcpio/script/miso_shutdown b/initcpio/script/miso_shutdown index fb7ed11..8cb05a2 100644 --- a/initcpio/script/miso_shutdown +++ b/initcpio/script/miso_shutdown @@ -20,10 +20,6 @@ done # Unmount the space used to store *.cow. umount /oldrun/miso/cowspace -if [[ -d /oldrun/miso/img ]];then - umount /oldrun/miso/img -fi - # Unmount boot device if needed (no copytoram=y used) if [[ ! -d /oldrun/miso/copytoram ]]; then if [[ -d /oldrun/miso/img_dev ]]; then