| Age | Commit message (Collapse) | Author |
|---|
|
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>
|
|
Signed-off-by: Dan McGee <dan@archlinux.org>
|
|
For now all it handles is bind mounting and squashfs
images that have to overlay at the root. The config
file syntax is obviously borrowed from fstab. This
is far from final, much of it could use some cleanup.
Signed-off-by: Simo Leone <simo@archlinux.org>
|
|
If asked to do so, mkarchiso simply copies a
directory full of addons to the iso root.
On boot, after union-mounting /real_root, the
archiso hook will look for and source an addon
config file. This file is a plain old bash
script, which makes it quite flexible. The addon
config should be written to take care of any
mounting that needs to be done, an example of
typical tasks is also included.
Signed-off-by: Simo Leone <simo@archlinux.org>
|
|
Signed-off-by: Dan McGee <dan@archlinux.org>
|
|
* Get rid of unnecessary trailing slash on BOOT_MOUNT variable
* Fix -eq/= mixup- we are comparing strings, not numbers
* Don't unmount /dev, as it was never mounted
Signed-off-by: Dan McGee <dan@archlinux.org>
|
|
Usually initcpio's init takes care of this, but
it never executes that far, so this is copypasta.
Signed-off-by: Simo Leone <simo@archlinux.org>
|
|
Move the vim modelines to the bottom, and add the tab settings.
Signed-off-by: Dan McGee <dan@archlinux.org>
|
|
Appears to have been changed to archlive.sqfs,
a couple hooks refered to the old name and didn't work.
Signed-off-by: Simo Leone <simo@archlinux.org>
|
|
This reverts commit 42d794561c1f3809f95299e4aa04cd3f28d4239b.
My bad. Bad logic on removing, it was an option anyway.
|
|
This implies a memory requirement for the running system, since
the sqfs image needs to be able to fit onto the ramdisk, which
breaks lowmem systems like qemu.
Signed-off-by: Simo Leone <simo@archlinux.org>
|
|
Several small changes just as a shim to get everything to work.
Signed-off-by: Simo Leone <simo@archlinux.org>
|
|
00a9fe69-e71b-0410-bb23-df0e5024db41
|
|
git-svn-id: http://phraktured.net/archiso@14 00a9fe69-e71b-0410-bb23-df0e5024db41
|