diff options
| -rw-r--r-- | archiso/hooks/archiso | 24 | ||||
| -rw-r--r-- | archiso/install/archiso | 5 | ||||
| -rw-r--r-- | archiso2dual/isolinux.cfg | 4 | ||||
| -rw-r--r-- | configs/syslinux-iso/boot-files/isolinux/isolinux.cfg | 2 |
4 files changed, 18 insertions, 17 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 diff --git a/archiso2dual/isolinux.cfg b/archiso2dual/isolinux.cfg index 6dd4bbb..071c87b 100644 --- a/archiso2dual/isolinux.cfg +++ b/archiso2dual/isolinux.cfg @@ -38,7 +38,7 @@ perform system maintenance. ENDTEXT MENU LABEL Boot Arch Linux (i686) KERNEL /boot/i686/vmlinuz26 -APPEND initrd=/boot/i686/archiso.img archisolabel=XXX tmpfs_size=75% locale=en_US.UTF-8 +APPEND initrd=/boot/i686/archiso.img archisolabel=XXX rw_branch_size=75% locale=en_US.UTF-8 # Next line should be uncommented when prepare enviroment to boot from PXE. #IPAPPEND 3 @@ -49,7 +49,7 @@ perform system maintenance. ENDTEXT MENU LABEL Boot Arch Linux (x86_64) KERNEL /boot/x86_64/vmlinuz26 -APPEND initrd=/boot/x86_64/archiso.img archisolabel=XXX tmpfs_size=75% locale=en_US.UTF-8 +APPEND initrd=/boot/x86_64/archiso.img archisolabel=XXX rw_branch_size=75% locale=en_US.UTF-8 # Next line should be uncommented when prepare enviroment to boot from PXE. #IPAPPEND 3 diff --git a/configs/syslinux-iso/boot-files/isolinux/isolinux.cfg b/configs/syslinux-iso/boot-files/isolinux/isolinux.cfg index dd9ef86..3cac5da 100644 --- a/configs/syslinux-iso/boot-files/isolinux/isolinux.cfg +++ b/configs/syslinux-iso/boot-files/isolinux/isolinux.cfg @@ -38,7 +38,7 @@ perform system maintenance. ENDTEXT MENU LABEL Boot Arch Linux KERNEL /boot/vmlinuz26 -APPEND initrd=/boot/archiso.img archisolabel=XXX tmpfs_size=75% locale=en_US.UTF-8 +APPEND initrd=/boot/archiso.img archisolabel=XXX rw_branch_size=75% locale=en_US.UTF-8 # Next line should be uncommented when prepare enviroment to boot from PXE. #IPAPPEND 3 |