Age | Commit message (Collapse) | Author |
|
fstype from klibc don't detect a vfat formatted blockdevice when try to
mount /dev/archiso to /bootmnt. Some users don't use the recommened
method with dd to bring the image to their USB stick. If they for ex.
use Unetbootin to put the iso image on their (v)fat formatted stick they
got lost with a kernel panic cause fstype won't detect vfat, so the
mount and the later squashfs bindings traps.
Signed-off-by: Gerhard Brauer <gerbra@archlinux.de>
|
|
test -f will fail if we wanted to bind to a directory,
so use test -r instead.
See FS#15356
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Missing slash caused bootmnt to be bound to /real_rootbootmnt
instead of /real_root/bootmnt
See FS#15356
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
If the archisolabel= option is specified on the kernel commandline,
a device /dev/archiso will be created and will be used to boot the
live system.
Patch from brain0 <thomas@archlinux.org>
Signed-off-by: Gerhard Brauer <gerbra@archlinux.de>
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
remount,append=: should be remount,append:
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Done to better reflect and indicate current progress.
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Change via AUR package
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Wrong slash! No idea how that happened :)
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
This should give us *just a bit* more delay before actually trying to do
things with the usb devices. Annoying, but will probably be effective
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Signed-off-by: Loui Chang <louipc.ist@gmail.com>
[Fixed menu.lst: LiveCD -> Live CD -aaron]
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
USB boot delay is now handled with the usbdelay kernel param (default=0)
We use the built in delay of usb-storage to control this. by setting the
module's delay param. If your USB device doesn't work on first boot, try
setting usbdelay=10 or so
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
It seems udev trigger/settle doesn't do what we expect,
so we'll add functionality for the rootdelay param back
in here.
This should help fix FS#12896
Original-idea: Gerhard Brauer <gerbra@archlinux.de>
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
This is a hacky way to mount squashfs images at directories
other than the root. We mount the image to a loop device
and then bind it to another directory.
This technically supersedes the 'bind' image type, so that
should be removed...
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Looks like my last-minute addition was goofed.
Use && not ||
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
This prevents some cosmetic errors when globbing fails
and the scripts try to mount something silly like "/dev/hd[a-z]"
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Fix squashfs mounting of all isomounts images, along
with a few other changes
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Merged into mkarchiso now
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Also check for this file instead of the root image
on mount, to make images more generic
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Specify the arch on the command line and mountpoints
so that we can support mutli-arch livecds
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
It's called root-image.sqfs rather than
archiso.sqfs nowadays.
Signed-off-by: Simo Leone <simo@archlinux.org>
|
|
Take away redirects so error messages are
readable, and wait to make sure udev creates
the loopback devices before we try to use them.
Signed-off-by: Simo Leone <simo@archlinux.org>
|
|
klibc-udev hasn't created cdrom symlinks in a while,
we have to look through kernel names ourselves.
Signed-off-by: Simo Leone <simo@archlinux.org>
|
|
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
udetrigger and udevsettle replaced by udevadm
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Additionally change grub prompts to use "ArchLinux LiveCD"
as the boot item name
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Use -D flag for install binary instead of mkdir
Remove old boot-{cd,usb} hooks
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
I like difficulty and then name was annoying me
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
|
|
Fixes FS#10206
Setting the drive to autoeject causes
udevadm trigger to always eject the device
if it isn't mounted.
Signed-off-by: Simo Leone <simo@archlinux.org>
|
|
I missed a hook last time, so it was producing some
scary, but harmless output.
Signed-off-by: Simo Leone <simo@archlinux.org>
|
|
Damnit 2.6.25
Signed-off-by: Simo Leone <simo@archlinux.org>
|
|
udev doesn't modprobe loop by itself so we have
to ask it nicely.
Signed-off-by: Simo Leone <simo@archlinux.org>
|
|
Loopbacks became a module in 2.6.25.
Signed-off-by: Simo Leone <simo@archlinux.org>
|
|
This should allow the disk to find itself
on external CD-ROM drives.
Signed-off-by: Simo Leone <simo@archlinux.org>
|
|
We weren't able to pick up usb devices at all,
because the kernel takes its sweet time realizing
that they're there.
Signed-off-by: Simo Leone <simo@archlinux.org>
|
|
Added to makefile and mkarchiso.
Signed-off-by: Simo Leone <simo@archlinux.org>
|
|
Signed-off-by: Dan McGee <dan@archlinux.org>
|
|
Signed-off-by: Dan McGee <dan@archlinux.org>
Signed-off-by: Simo Leone <simo@archlinux.org>
|
|
Signed-off-by: Dan McGee <dan@archlinux.org>
|
|
Signed-off-by: Simo Leone <simo@archlinux.org>
|
|
Also improved variable naming.
Signed-off-by: Simo Leone <simo@archlinux.org>
|
|
No longer assume the image is in the addons
directory.
Signed-off-by: Simo Leone <simo@archlinux.org>
|
|
The check for a comment line wasn't actually working
before. Shell quoting ftl.
Signed-off-by: Simo Leone <simo@archlinux.org>
|
|
This allows the root image to remain a [mostly] pristine
image, and turns default liveCD configurations into an
overlay, rather than copying them into the root image.
Signed-off-by: Simo Leone <simo@archlinux.org>
|
|
Moved addon mounting code into functions.
Signed-off-by: Simo Leone <simo@archlinux.org>
|