Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archiso/hooks
diff options
context:
space:
mode:
authorGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2011-11-28 10:35:05 -0300
committerGerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>2011-11-28 10:35:05 -0300
commit50cab06b8494b6c414b241cd03a25a80c92c835b (patch)
tree203433c10874c5c48307e5c1b801a5c164efa8ce /archiso/hooks
parent87f3297ea37a4b8c80e4f7d0ab77b80f130e8362 (diff)
[archiso] Use different logic when archisodevice == cow_device
* Now bootmnt/img_dev is always a ro-mount, and cowspace is first ro-mount then rw-mount. * Fix a "hidden" bug: at the time of test [[ -ef ]], if devices nodes are not ready, such test will fail then archisodevice will mounted ro and when cow_device is mounted to be rw it fails. (I recently suffered this on a machine with slow USB) Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
Diffstat (limited to 'archiso/hooks')
-rw-r--r--archiso/hooks/archiso9
-rw-r--r--archiso/hooks/archiso_loop_mnt6
2 files changed, 4 insertions, 11 deletions
diff --git a/archiso/hooks/archiso b/archiso/hooks/archiso
index 5d9e5df..f446bd2 100644
--- a/archiso/hooks/archiso
+++ b/archiso/hooks/archiso
@@ -167,11 +167,7 @@ archiso_mount_handler() {
_init_loop_dev
- if [[ "${archisodevice}" -ef "${cow_device}" ]]; then
- _mnt_dev "${archisodevice}" "/run/archiso/bootmnt"
- else
- _mnt_dev "${archisodevice}" "/run/archiso/bootmnt" "-r"
- fi
+ _mnt_dev "${archisodevice}" "/run/archiso/bootmnt" "-r"
if [[ ! -f "${aitab}" ]]; then
echo "ERROR: '${aitab}' file does not exist."
@@ -203,7 +199,8 @@ archiso_mount_handler() {
fi
if [[ -n "${cow_device}" ]]; then
- _mnt_dev "${cow_device}" "/run/archiso/cowspace"
+ _mnt_dev "${cow_device}" "/run/archiso/cowspace" "-r"
+ mount -o remount,rw "/run/archiso/cowspace"
else
msg ":: Mounting /run/archiso/cowspace (tmpfs) filesystem, size=${cowspace_size}..."
mkdir -p /run/archiso/cowspace
diff --git a/archiso/hooks/archiso_loop_mnt b/archiso/hooks/archiso_loop_mnt
index c1b25df..e52dc69 100644
--- a/archiso/hooks/archiso_loop_mnt
+++ b/archiso/hooks/archiso_loop_mnt
@@ -11,11 +11,7 @@ archiso_loop_mount_handler () {
newroot="${1}"
msg ":: Setup a loop device from ${img_loop} located at device ${img_dev}"
- if [[ "${img_dev}" -ef "${cow_device}" ]]; then
- _mnt_dev "${img_dev}" "/run/archiso/img_dev"
- else
- _mnt_dev "${img_dev}" "/run/archiso/img_dev" "-r"
- fi
+ _mnt_dev "${img_dev}" "/run/archiso/img_dev" "-r"
_dev_loop=$(losetup -f)
if ! losetup "${_dev_loop}" "/run/archiso/img_dev/${img_loop}"; then