summaryrefslogtreecommitdiff
path: root/hooks
diff options
context:
space:
mode:
authorSimo Leone <simo@archlinux.org>2007-10-05 14:27:52 -0500
committerDan McGee <dpmcgee@gmail.com>2007-10-09 20:59:26 -0500
commit69c9986a9c2dc6ad18bb1de0c2c2a328c5c94239 (patch)
treed82403b2404ce2638c4ca4b56c438535020ed2af /hooks
parentd0688d1130a98f9c015f227f7f94a78affa7813f (diff)
downloadarchiso32-69c9986a9c2dc6ad18bb1de0c2c2a328c5c94239.tar.xz
Got archiso into working condition
Several small changes just as a shim to get everything to work. Signed-off-by: Simo Leone <simo@archlinux.org>
Diffstat (limited to 'hooks')
-rw-r--r--hooks/archiso1
-rw-r--r--hooks/boot-cd6
2 files changed, 3 insertions, 4 deletions
diff --git a/hooks/archiso b/hooks/archiso
index c60df2b..3d9e7ec 100644
--- a/hooks/archiso
+++ b/hooks/archiso
@@ -6,7 +6,6 @@ run_hook ()
fi
msg -n ":: Mounting tmpfs, size=${ramdisk_size}..."
mount -t tmpfs -o "size=${ramdisk_size}" tmpfs /tmpfs
- mkdir /tmpfs/bootcd
msg "done."
if [ "x${BOOT_MOUNT}" -eq "x" ]; then
diff --git a/hooks/boot-cd b/hooks/boot-cd
index d6d9da6..a730412 100644
--- a/hooks/boot-cd
+++ b/hooks/boot-cd
@@ -3,14 +3,14 @@ run_hook ()
{
msg ":: Scanning for boot cdrom device..."
- /bin/mkdir -p /tmpfs/bootmnt
- bootmnt="/tmpfs/bootmnt/"
+ /bin/mkdir -p /bootmnt
+ bootmnt="/bootmnt/"
found=0
/bin/modprobe -q isofs >/dev/null 2>&1
for cdrom in /dev/cd/*; do
if mount -r -t iso9660 "${cdrom}" ${bootmnt} >/dev/null 2>&1; then
- if [ -e "${bootmnt}/archiso.sqfs" ]; then
+ if [ -e "${bootmnt}/archlive.sqfs" ]; then
found=1
msg "${cdrom}"
break