From 334db092b52e78a68d012ce2fa453ec243943c64 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Mon, 28 Nov 2011 10:35:05 -0300 Subject: [archiso] Check if /run/archiso/bootmnt is a mountpoint. In this way allow to mount /run/archiso/bootmnt from another hook, but still use the logic from the main mount_hook, skipping only this mount. Signed-off-by: Gerardo Exequiel Pozzi --- archiso/hooks/archiso | 2 +- archiso/install/archiso | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'archiso') diff --git a/archiso/hooks/archiso b/archiso/hooks/archiso index 839be9b..d03914a 100644 --- a/archiso/hooks/archiso +++ b/archiso/hooks/archiso @@ -167,7 +167,7 @@ archiso_mount_handler() { _init_loop_dev - _mnt_dev "${archisodevice}" "/run/archiso/bootmnt" "-r" + mountpoint -q "/run/archiso/bootmnt" || _mnt_dev "${archisodevice}" "/run/archiso/bootmnt" "-r" if [[ ! -f "${aitab}" ]]; then echo "ERROR: '${aitab}' file does not exist." diff --git a/archiso/install/archiso b/archiso/install/archiso index 7984c53..3b4e223 100644 --- a/archiso/install/archiso +++ b/archiso/install/archiso @@ -8,6 +8,7 @@ build () add_binary /lib/udev/cdrom_id add_binary /sbin/blockdev add_binary /sbin/dmsetup + add_binary /bin/mountpoint add_file /lib/udev/rules.d/60-cdrom_id.rules add_file /lib/udev/rules.d/10-dm.rules -- cgit v1.2.2