diff options
| author | Aaron Griffin <aaronmgriffin@gmail.com> | 2008-12-05 10:17:34 -0800 |
|---|---|---|
| committer | Aaron Griffin <aaronmgriffin@gmail.com> | 2008-12-18 22:09:17 -0600 |
| commit | 901526970e68e679d21a1c172c6b2be03457f9bb (patch) | |
| tree | 7bb55056a0ab4c28f3cbcf2e95e521bbb988f91e /archiso | |
| parent | 88ae858f514755992cebf5e13811d54f7a19309a (diff) | |
Change mounts file to isomounts
Also check for this file instead of the root image
on mount, to make images more generic
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
Diffstat (limited to 'archiso')
| -rw-r--r-- | archiso/hooks/archiso | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/archiso/hooks/archiso b/archiso/hooks/archiso index 60e14bf..46ed43f 100644 --- a/archiso/hooks/archiso +++ b/archiso/hooks/archiso @@ -53,7 +53,7 @@ run_hook () msg ":: Scanning cd drives..." for cdrom in /dev/hd[a-z] /dev/sr[0-9]* /dev/scd[a-z] /dev/sg[0-9]*; do if mount -r -t iso9660 "${cdrom}" ${bootmnt} >/dev/null 2>&1; then - if [ -e "${bootmnt}/root-image.sqfs" ]; then + if [ -e "${bootmnt}/isomounts" ]; then found=1 msg "${cdrom}" break @@ -69,7 +69,7 @@ run_hook () for usb in /dev/sd[a-z][0-9]; do if mount -r -t vfat "${usb}" ${bootmnt} >/dev/null 2>&1 ||\ mount -r -t ext2 "${usb}" ${bootmnt} >/dev/null 2>&1; then - if [ -e "${bootmnt}/root-image.sqfs" ]; then + if [ -e "${bootmnt}/isomounts" ]; then found=1 msg "${usb}" break @@ -102,7 +102,7 @@ run_hook () /bin/mount -t unionfs -o dirs=/tmpfs=rw none /real_root export LOOP_NUM="0" - if [ -e "/mounts" ]; then + if [ -e "/isomounts" ]; then msg ":: Mounting images" while read img imgarch mountpoint type; do # check if this line is a comment (starts with #) @@ -115,7 +115,7 @@ run_hook () elif [ "${type}" = "squashfs" ]; then _mnt_squashfs "${img}" fi - done < /mounts + done < /isomounts else msg ":: No mountable images found" fi |