root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

initcpio: create dedicated overlay_root instead of using cowspace

Browse source
This commit is contained in:
udeved 2016-10-15 17:53:53 +02:00
parent ab51b4be29
commit cef3499930
3 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
initcpio/hooks/miso
View file

@ -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

7
initcpio/hooks/miso_aufs
View file

@ -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}"

4
initcpio/script/miso_shutdown
View file

@ -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