Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archlive_hook15
1 files changed, 6 insertions, 9 deletions
diff --git a/archlive_hook b/archlive_hook
index 754c266..0b3ea1b 100644
--- a/archlive_hook
+++ b/archlive_hook
@@ -15,9 +15,8 @@ run_hook ()
squashimg="/tmpfs/bootcd/archlive.sqfs"
/bin/modprobe -q isofs >/dev/null 2>&1
- PS1="ramfs$ " /bin/sh -i
for cdrom in /dev/cd/*; do
- if mount -r -t isofs "${cdrom}" /tmpfs/bootcd >/dev/null 2>&1; then
+ if mount -r -t iso9660 "${cdrom}" /tmpfs/bootcd >/dev/null 2>&1; then
if [ -e "${squashimg}" ]; then
squashfound=1
msg "${cdrom}"
@@ -34,26 +33,24 @@ run_hook ()
exit 1
fi
- if [ "${copytoram}" == "y" ]; then
+ if [ "${copytoram}" = "y" ]; then
/bin/cat /tmpfs/bootcd/archlive.sqfs > /tmpfs/archlive.sqfs
squashimg="/tmpfs/archlive.sqfs"
fi
- msg -n ":: Mounting squashfs image..."
+ msg ":: Mounting squashfs image"
/bin/modprobe -q squashfs >/dev/null 2>&1
/bin/mkdir -p /tmpfs/squashfs_root
- if ! /bin/losetup /dev/loop0 "${squashimg}"; then
+ if ! /bin/losetup /dev/loop0 "${squashimg}" >/dev/null 2>&1; then
echo "ERROR: Cannot mount loop device /dev/loop0...aborting"
exit 1
fi
/bin/mount -r -t squashfs /dev/loop0 /tmpfs/squashfs_root
- msg "done."
- msg -n ":: Mounting root (union) filesystem..."
+ msg ":: Mounting root (union) filesystem"
/bin/modprobe -q unionfs >/dev/null 2>&1
- /bin/mount -t unionfs -o dirs=/tmpfs=rw:/tmpfs/squashfs_root=ro,debug=0 none /real_root
- msg "done."
+ /bin/mount -t unionfs -o dirs=/tmpfs=rw:/tmpfs/squashfs_root=ro none /real_root
if [ -d /proc/sys/dev/cdrom ]; then
echo 0 > /proc/sys/dev/cdrom/lock