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

Split aufs mount command from _mnt_squashfs()

Browse Source 
New function _mnt_aufs(). Don't display incorrect message (Adding new aufs...)
when no aufs branch is mounted, because mount type is bind.

Also, makes the code more clean :)

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
This commit is contained in:
Gerardo Exequiel Pozzi 2010-03-01 10:59:11 -03:00
parent c65f463ce3
commit 4d37d70884
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
archiso/hooks/archiso
View File

@ -1,3 +1,12 @@
# args: source, mountpoint
_mnt_aufs() {
src="${1}"
mnt="${2}"
msg "::: Adding new aufs branch: ${src} to ${mnt}"
mkdir -p "${mnt}"
/bin/mount -t aufs -o remount,append:"${src}"=ro none "${mnt}"
}
# args: source, mountpoint
_mnt_bind() {
src="${1}"
@ -16,16 +25,17 @@ _mnt_squashfs() {
tmp_mnt="/tmpfs/mnt/${img_name}"
if [ "${copytoram}" = "y" ]; then
msg ":: Copying squashfs image to RAM"
msg -n ":: Copying squashfs image to RAM"
/bin/cp "${img}" "/tmpfs.sqfs/${img_fullname}"
img="/tmpfs.sqfs/${img_fullname}"
msg "done."
fi
msg "::: Adding new aufs branch: ${img_name}"
mkdir -p "${tmp_mnt}"
/bin/mount -r -t squashfs "${img}" "${tmp_mnt}"
if [ "/${mnt#/*/}" = "/" ]; then
/bin/mount -t aufs -o remount,append:"${tmp_mnt}"=ro none "${mnt}"
_mnt_aufs "${tmp_mnt}" "${mnt}"
else
_mnt_bind "${tmp_mnt}" "${mnt}"
fi