summaryrefslogtreecommitdiff
path: root/archiso
diff options
context:
space:
mode:
authorGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2010-07-09 15:58:17 -0300
committerGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2010-07-09 16:14:55 -0300
commit1bbeeb0e5b54b7c8f2de959d5f5dece90b7825a1 (patch)
treea48def94b3453436f4691ea5bfc3c3fe496c5f17 /archiso
parent9154b028813e61e7effef005a19e916dbdd642f9 (diff)
downloadarchiso32-1bbeeb0e5b54b7c8f2de959d5f5dece90b7825a1.tar.xz
Rename directories and parameteres to be more descriptive
* squashfs images that will be part of read-only branchs for union mount in / are mounted on /ro_branch/{image_name} instead of /tmpfs/mnt/{image_name} (and avoid empty dirs on live env under /mnt) * tmpfs that will be part of read-write branch for union mount in / is mounted on /rw_branch instead of /tmpfs * tmpfs that is for store *.sqfs images when copytoram=y, is mounted on /copytoram instead of /tmpfs.sqfs * tmpfs_size= parameter renamed to rw_branch_size= * tmpfs_sqfs_size= parameter renamed to copytoram_size= Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
Diffstat (limited to 'archiso')
-rw-r--r--archiso/hooks/archiso24
-rw-r--r--archiso/install/archiso5
2 files changed, 15 insertions, 14 deletions
diff --git a/archiso/hooks/archiso b/archiso/hooks/archiso
index 23ae4e2..ef8dc58 100644
--- a/archiso/hooks/archiso
+++ b/archiso/hooks/archiso
@@ -22,12 +22,12 @@ _mnt_squashfs() {
mnt="${2}"
img_fullname="${img##*/}";
img_name="${img_fullname%.*}"
- tmp_mnt="/tmpfs/mnt/${img_name}"
+ tmp_mnt="/ro_branch/${img_name}"
if [ "${copytoram}" = "y" ]; then
msg -n ":: Copying squashfs image to RAM..."
- /bin/cp "${img}" "/tmpfs.sqfs/${img_fullname}"
- img="/tmpfs.sqfs/${img_fullname}"
+ /bin/cp "${img}" "/copytoram/${img_fullname}"
+ img="/copytoram/${img_fullname}"
msg "done."
fi
@@ -46,12 +46,12 @@ run_hook () {
arch="$(uname -m)"
fi
- if [ "x${tmpfs_size}" = "x" ]; then
- tmpfs_size="75%"
+ if [ "x${rw_branch_size}" = "x" ]; then
+ rw_branch_size="75%"
fi
- if [ "x${tmpfs_sqfs_size}" = "x" ]; then
- tmpfs_sqfs_size="75%"
+ if [ "x${copytoram_size}" = "x" ]; then
+ copytoram_size="75%"
fi
if [ "x${archisobasedir}" != "x" ]; then
@@ -109,17 +109,17 @@ archiso_mount_handler() {
fi
if [ "${copytoram}" = "y" ]; then
- msg -n ":: Mounting tmpfs (for squashfs), size=${tmpfs_sqfs_size}..."
- mount -t tmpfs -o "size=${tmpfs_sqfs_size}",mode=0755 tmpfs /tmpfs.sqfs
+ msg -n ":: Mounting /copytoram (tmpfs) filesystem, size=${copytoram_size}..."
+ mount -t tmpfs -o "size=${copytoram_size}",mode=0755 copytoram /copytoram
msg "done."
fi
- msg -n ":: Mounting tmpfs, size=${tmpfs_size}..."
- mount -t tmpfs -o "size=${tmpfs_size}",mode=0755 tmpfs /tmpfs
+ msg -n ":: Mounting rw_branch (tmpfs) filesystem, size=${rw_branch_size}..."
+ mount -t tmpfs -o "size=${rw_branch_size}",mode=0755 rw_branch /rw_branch
msg "done."
msg ":: Mounting root (aufs) filesystem"
- /bin/mount -t aufs -o dirs=/tmpfs=rw none "${newroot}"
+ /bin/mount -t aufs -o dirs=/rw_branch=rw none "${newroot}"
if [ $? -ne 0 ]; then
echo "ERROR: while mounting root (aufs) filesystem."
exit 1
diff --git a/archiso/install/archiso b/archiso/install/archiso
index 9b45080..7ad9d06 100644
--- a/archiso/install/archiso
+++ b/archiso/install/archiso
@@ -10,8 +10,9 @@ install ()
BINARIES=""
FILES=""
- add_dir /tmpfs
- add_dir /tmpfs.sqfs
+ add_dir /rw_branch
+ add_dir /ro_branch
+ add_dir /copytoram
add_dir /bootmnt
add_device /lib/udev/devices/loop0 b 7 0