Johannes/ISO
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update archiso hook to match root image naming

Browse Source 
It's called root-image.sqfs rather than
archiso.sqfs nowadays.

Signed-off-by: Simo Leone <simo@archlinux.org>
This commit is contained in:
Simo Leone 2008-11-13 03:51:12 -06:00
parent 460b0f1edc
commit 0a8b401685
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
archiso/hooks/archiso
View File

@ -49,7 +49,7 @@ run_hook ()
msg ":: Scanning cd drives..." msg ":: Scanning cd drives..."
for cdrom in /dev/hd[a-z] /dev/sr[0-9]* /dev/scd[a-z] /dev/sg[0-9]*; do 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 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 found=1
msg "${cdrom}" msg "${cdrom}"
break break
@ -65,7 +65,7 @@ run_hook ()
for usb in /dev/sd[a-z][0-9]; do for usb in /dev/sd[a-z][0-9]; do
if mount -r -t vfat "${usb}" ${bootmnt} >/dev/null 2>&1 ||\ if mount -r -t vfat "${usb}" ${bootmnt} >/dev/null 2>&1 ||\
mount -r -t ext2 "${usb}" ${bootmnt} >/dev/null 2>&1; then 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 found=1
msg "${usb}" msg "${usb}"
break break
@ -84,11 +84,11 @@ run_hook ()
exit 1 exit 1
fi fi
base_img="${bootmnt}/archiso.sqfs" base_img="${bootmnt}/root-image.sqfs"
if [ "${copytoram}" = "y" ]; then if [ "${copytoram}" = "y" ]; then
msg ":: Copying squashfs image to RAM" msg ":: Copying squashfs image to RAM"
/bin/cat ${base_img} > /tmpfs/archiso.sqfs /bin/cat ${base_img} > /tmpfs/root-image.sqfs
base_img="/tmpfs/archiso.sqfs" base_img="/tmpfs/root-image.sqfs"
fi fi
/bin/modprobe -q squashfs >/dev/null 2>&1 /bin/modprobe -q squashfs >/dev/null 2>&1