projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support setting upperdir tmpfs size with overlay-size boot parameter
[live-boot-grml.git]
/
components
/
9990-overlay.sh
diff --git
a/components/9990-overlay.sh
b/components/9990-overlay.sh
index
58828f6
..
db6a44e
100755
(executable)
--- a/
components/9990-overlay.sh
+++ b/
components/9990-overlay.sh
@@
-110,7
+110,7
@@
setup_unionfs ()
;;
esac
;;
esac
- mpoint=
"${croot}/${imagename}"
+ mpoint=
$(trim_path "${croot}/${imagename}")
rootfslist="${mpoint} ${rootfslist}"
mkdir -p "${mpoint}"
rootfslist="${mpoint} ${rootfslist}"
mkdir -p "${mpoint}"
@@
-240,12
+240,12
@@
setup_unionfs ()
then
cowdevice="tmpfs"
cow_fstype="tmpfs"
then
cowdevice="tmpfs"
cow_fstype="tmpfs"
- cow_mountopt="rw,noatime,mode=755"
+ cow_mountopt="rw,noatime,mode=755
,size=${OVERLAY_SIZE:-50%}
"
fi
if [ -n "${PERSISTENCE_READONLY}" ] && [ "${cowdevice}" != "tmpfs" ]
then
fi
if [ -n "${PERSISTENCE_READONLY}" ] && [ "${cowdevice}" != "tmpfs" ]
then
- mount -t tmpfs -o rw,noatime,mode=755 tmpfs "/live/overlay"
+ mount -t tmpfs -o rw,noatime,mode=755
,size=${OVERLAY_SIZE:-50%}
tmpfs "/live/overlay"
root_backing="/live/persistence/$(basename ${cowdevice})-root"
mkdir -p ${root_backing}
else
root_backing="/live/persistence/$(basename ${cowdevice})-root"
mkdir -p ${root_backing}
else
@@
-274,7
+274,7
@@
setup_unionfs ()
panic "only one RO file system supported with exposedroot: ${rootfslist}"
fi
panic "only one RO file system supported with exposedroot: ${rootfslist}"
fi
- mount -
-
bind ${rootfs} ${rootmnt} || \
+ mount -
o
bind ${rootfs} ${rootmnt} || \
panic "bind mount of ${rootfs} failed"
if [ -z "${SKIP_UNION_MOUNTS}" ]
panic "bind mount of ${rootfs} failed"
if [ -z "${SKIP_UNION_MOUNTS}" ]
@@
-288,9
+288,9
@@
setup_unionfs ()
fi
for dir in ${cow_dirs}; do
fi
for dir in ${cow_dirs}; do
- unionmountpoint=
"${rootmnt}${dir}"
+ unionmountpoint=
$(trim_path "${rootmnt}${dir}")
mkdir -p ${unionmountpoint}
mkdir -p ${unionmountpoint}
- cow_dir=
"/live/overlay${dir}"
+ cow_dir=
$(trim_path "/live/overlay${dir}")
rootfs_dir="${rootfs}${dir}"
mkdir -p ${cow_dir}
if [ -n "${PERSISTENCE_READONLY}" ] && [ "${cowdevice}" != "tmpfs" ]
rootfs_dir="${rootfs}${dir}"
mkdir -p ${cow_dir}
if [ -n "${PERSISTENCE_READONLY}" ] && [ "${cowdevice}" != "tmpfs" ]