diff options
| author | Simo Leone <simo@archlinux.org> | 2008-11-13 03:51:12 -0600 |
|---|---|---|
| committer | Simo Leone <simo@archlinux.org> | 2008-11-13 03:51:12 -0600 |
| commit | 0a8b40168507e42c2327949f4b00b9206ad4b413 (patch) | |
| tree | 150d5a22c1c226490ff453405800bc9006fd42a6 /archiso/hooks | |
| parent | 460b0f1edc1596cbd0dc5df5671d227a0fc1b780 (diff) | |
Update archiso hook to match root image naming
It's called root-image.sqfs rather than
archiso.sqfs nowadays.
Signed-off-by: Simo Leone <simo@archlinux.org>
Diffstat (limited to 'archiso/hooks')
| -rw-r--r-- | archiso/hooks/archiso | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/archiso/hooks/archiso b/archiso/hooks/archiso index d3d8736..e6ccfd4 100644 --- a/archiso/hooks/archiso +++ b/archiso/hooks/archiso @@ -49,7 +49,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}/archiso.sqfs" ]; then + if [ -e "${bootmnt}/root-image.sqfs" ]; then found=1 msg "${cdrom}" break @@ -65,7 +65,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}/archiso.sqfs" ]; then + if [ -e "${bootmnt}/root-image.sqfs" ]; then found=1 msg "${usb}" break @@ -84,11 +84,11 @@ run_hook () exit 1 fi - base_img="${bootmnt}/archiso.sqfs" + base_img="${bootmnt}/root-image.sqfs" if [ "${copytoram}" = "y" ]; then msg ":: Copying squashfs image to RAM" - /bin/cat ${base_img} > /tmpfs/archiso.sqfs - base_img="/tmpfs/archiso.sqfs" + /bin/cat ${base_img} > /tmpfs/root-image.sqfs + base_img="/tmpfs/root-image.sqfs" fi /bin/modprobe -q squashfs >/dev/null 2>&1 |