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

Remove special handling for vfat, all done via blkid

Browse Source 
* Add archisodevide= boot option (suggested by brain0)
(if declared use it, if not use /dev/archiso created via udev rule)
* Removed redundant modprobe commands,
(modules are loaded automatically on mount -t)
* Other minor changes

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
This commit is contained in:
Gerardo Exequiel Pozzi 2010-02-05 17:20:34 -03:00 committed by Aaron Griffin
parent 1baefc75a6
commit 5f0614b42f
1 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
archiso/hooks/archiso
View File

@ -9,12 +9,13 @@ _mnt_bind()
# args: /path/to/image_file # args: /path/to/image_file
_mnt_squashfs() _mnt_squashfs()
{ {
/sbin/modprobe -q loop >/dev/null 2>&1 /sbin/modprobe -q loop > /dev/null 2>&1
img="${1}" img="${1}"
base_img="${img##*/}"; base_img="${img##*/}";
mnt="${2}" mnt="${2}"
# FIX: This options does not work (see FS#17182)
if [ "${copytoram}" = "y" ]; then if [ "${copytoram}" = "y" ]; then
msg ":: Copying squashfs image to RAM" msg ":: Copying squashfs image to RAM"
/bin/cat ${img} > "/tmpfs/${base_img}" /bin/cat ${img} > "/tmpfs/${base_img}"
@ -56,30 +57,25 @@ run_hook ()
isomounts="/bootmnt/isomounts" isomounts="/bootmnt/isomounts"
fi fi
if [ "x${archisodevice}" = "x" ]; then
archisodevice="/dev/archiso"
fi
msg -n ":: Mounting tmpfs, size=${tmpfs_size}..." msg -n ":: Mounting tmpfs, size=${tmpfs_size}..."
mount -t tmpfs -o "size=${tmpfs_size}" tmpfs /tmpfs mount -t tmpfs -o "size=${tmpfs_size}" tmpfs /tmpfs
msg "done." msg "done."
msg ":: Waiting for boot device..." msg ":: Waiting for boot device..."
while ! poll_device ${archisodevice} 30; do
/bin/mkdir -p /bootmnt
while ! poll_device /dev/archiso 30; do
echo "ERROR: boot device didn't show up after 30 seconds..." echo "ERROR: boot device didn't show up after 30 seconds..."
echo " Falling back to interactive prompt" echo " Falling back to interactive prompt"
echo " You can try to fix the problem manually, log out when you are finished" echo " You can try to fix the problem manually, log out when you are finished"
PS1="ramfs$ " /bin/sh -i PS1="ramfs$ " /bin/sh -i
done done
FSTYPE=$(blkid -o value -s TYPE /dev/archiso 2>/dev/null) FSTYPE=$(blkid -o value -s TYPE ${archisodevice} 2> /dev/null)
if [ -n "${FSTYPE}" ]; then if [ -n "${FSTYPE}" ]; then
if [ "${FSTYPE}" = "unknown" ]; then if mount -r -t "${FSTYPE}" ${archisodevice} /bootmnt > /dev/null 2>&1; then
# First try mounting then with vfat, maybe someone put the image on
# USB stick with unetbootin or similar. vfat is not detected by fstype.
_FSTYPE="vfat"
else
_FSTYPE=$FSTYPE
fi
if mount -r -t "${_FSTYPE}" /dev/archiso /bootmnt >/dev/null 2>&1; then
if [ -e "${isomounts}" ]; then if [ -e "${isomounts}" ]; then
echo "SUCCESS: Mounted archiso volume successfully." echo "SUCCESS: Mounted archiso volume successfully."
else else
@ -87,20 +83,13 @@ run_hook ()
exit 1 exit 1
fi fi
else else
if [ "${FSTYPE}" = "unknown" ]; then echo "ERROR; Failed to mount ${archisodevice} (FS is ${FSTYPE})"
echo "ERROR: Failed to mount /dev/archiso (FS is unknown and not vfat)."
else
echo "ERROR; Failed to mount /dev/archiso (FS is ${FSTYPE}."
fi
exit 1 exit 1
fi fi
else else
echo "ERROR: /dev/archiso found, but the filesystem type is unknown." echo "ERROR: ${archisodevice} found, but the filesystem type is unknown."
fi fi
/sbin/modprobe -q squashfs >/dev/null 2>&1
/sbin/modprobe -q aufs >/dev/null 2>&1
msg ":: Mounting root (aufs) filesystem" msg ":: Mounting root (aufs) filesystem"
/bin/mount -t aufs -o dirs=/tmpfs=rw none /real_root /bin/mount -t aufs -o dirs=/tmpfs=rw none /real_root
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then