summaryrefslogtreecommitdiff
path: root/archiso
AgeCommit message (Collapse)Author
2010-03-06Add -p to blkid in hooks, to bypass the cache like in udev rules.Gerardo Exequiel Pozzi
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2010-03-01Split aufs mount command from _mnt_squashfs()Gerardo Exequiel Pozzi
New function _mnt_aufs(). Don't display incorrect message (Adding new aufs...) when no aufs branch is mounted, because mount type is bind. Also, makes the code more clean :) Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2010-03-01Welcome back copytoram= optionGerardo Exequiel Pozzi
Fixes FS#17182: copytoram=y does not work with aufs The solution is simple, just use a directory outside aufs tree. * If copytoram=y, then another tmpfs is mounted but on /tmpfs.sqfs * Add a new option: tmpfs_sqfs_size= (default to 75%) * Lock cdrom drive is not locked if copytoram=y Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2010-02-18Rename archiso-early hook to archiso_earlyGerardo Exequiel Pozzi
To make compatible with disablehooks= param. Since "hook_archiso-early" is not a valid variable name. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2010-02-17Removed a non-working option: copytoramGerardo Exequiel Pozzi
Keep the code clean. For more reference see FS#17182 to view what is the issue Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2010-02-17Fix coding style in archiso hookGerardo Exequiel Pozzi
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2010-02-17Pass $newroot as part of the $mountpoint avoiding a global variableGerardo Exequiel Pozzi
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2010-02-17Take advantage of module autoloading when mounting images as loopGerardo Exequiel Pozzi
* Make first /dev/loop0 device at archiso install hook. * Remove unneeded losetup, all is done directly via mount. * Images are now mounted on /tmpfs/mnt/image-name instead of /tmpfs/mnt/loopN, removing unneeded counter. * Add some variables to make code more readable. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2010-02-17Drop to recovery shell when mounting main media filesystem fails.Gerardo Exequiel Pozzi
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2010-02-16Implement mount hook function in archiso hook.Gerardo Exequiel Pozzi
Next version of mkinitcpio > 0.6.2 implements mount hook functionality. So can avoid skipping normal flow of main init script, and removing common end code with it. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2010-02-08Fixed offset of partition on isoGerardo Exequiel Pozzi
Split from commit 00dda7d4 from Svenstaro repo: changed -offset for mkarchiso from default 0 to 1 so that the other partition on the usb device can still be edited after dd'ing to it Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2010-02-06Remove special handling for vfat, all done via blkidGerardo Exequiel Pozzi
* 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>
2010-02-06Update archiso hooks to work with next mkinitcpio 0.6Gerardo Exequiel Pozzi
Some basic changes to make archiso hooks work with the next mkinitcpio 0.6 Tested under KVM, a ""2010.02"" and works fine with it. NOTE: current mkinitcpio-0.5.99.2-2 does not include "losetup", maybe will be included in next version, see #[1]. For now must be added manually. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2009-12-04Fix indentation of previus commitGerardo Exequiel Pozzi
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2009-12-02Abort mkarchiso if isolinux.cfg is not found.Gerardo Exequiel Pozzi
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2009-12-01Removed unused gen_grubscan script and grub reference in mkarchisoGerardo Exequiel Pozzi
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2009-12-01Use 11 chars for fslabel for VFAT compatibilityGerardo Exequiel Pozzi
Also use ARCH_YYYYMM format instead of random chars, removing pwgen dep. Closing FS#14919. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-12-01Add an error message when mounting aufs fails, then exit 1Gerardo Exequiel Pozzi
Closes FS#13381. Waiting 30 seconds for device /dev/archiso ... SUCCESS: Mounted archiso volume successfully. squashfs: version 4.0 (2009/01/31) Phillip Lougher aufs 2-standalone.tree-20090907 :: Mounting root (aufs) filesystem aufs au_xino_do_write:371:mount[407]: I/O Error, write failed (4294967268) aufs au_xino_set:1115:mount[407]: I/O Error, failed creating xino(-5). mount: Invalid argument ERROR: while mounting root (aufs) filesystem. Kernel panic - not syncing: Attempted to kill init! Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2009-11-30More removal of old bootloader supportAaron Griffin
Only support syslinux now. Grub and other things can still be managed manually by running mkisofs manually. Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-11-30Removed pwgen dependencySven-Hendrik Haase
2009-11-30mkarchiso: cleaned up to use isohybrid onlySven-Hendrik Haase
2009-11-23mkarchiso: cleanup opts, user dir creationSven-Hendrik Haase
As in title, this patch cleans up opt flags that exist for no reason and adds additional flags to modify the disk meta info which would otherwise be hardcoded. I wasn't quite sure about the user directory part but it doesn't seem like a good idea to put that part into the script and therefore I commented it out. It would probably interfere with rc.local scripts that take care of skel copying. I replaced the part after the TODO with a safe guard to make sure that people who are not aware of the changes will not be caught by surprise. Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-11-19Silent modprobe loop loading in mkarchisoGerardo Exequiel Pozzi
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2009-11-17Only lock the optical drive if mounted from thisGerardo Exequiel Pozzi
Check if FSTYPE is iso9660 or UDF, and only in this case look the optical drive. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2009-11-17Rename ramdisk_size parameter to tmpfs_size to avoid conflictGerardo Exequiel Pozzi
Rename ramdisk_size parameter to tmpfs_size to avoid conflict with the kernel parameter that is for old ramdisk based blockdevs (/dev/ramN) and confusion to users. The kernel parameter ramdisk_size=N is in "N * k size", while tmpfs size=N is in "N * [ k | m | g ] byte size" or "in N% of RAM", like is used by default on archiso. This parameter is used only for tmpfs in size option. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2009-11-09Avoid force/rebuild of squashfs images if already updated.Gerardo Exequiel Pozzi
Check if there are any modification of files/directories inside the target directory for squashfs image. Implements in some way this item in TODO: * Add 'needsupdate' function to check if a squashfs image in the iso dir is up to date, if so, skip it; else rebuild it. No more need for the -f flag Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2009-10-26Support custom isomounts in archiso hook.Gerardo Exequiel Pozzi
Implement this feature request: FS#16835 - isomounts file whithin archiso hook is inflexible Add an optional "isomounts" kernel command line parameter. In this way, can have differents combinations of kernels/ramdisk/filesystems.sqfs on the same media. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2009-10-21Fix small typo in install/archiso for initcpioGerardo Exequiel Pozzi
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2009-10-21Fix how mkarchiso makes usb imageGerardo Exequiel Pozzi
The current implementation in how partition is created for ext2 img it looks a bit bad. This patch makes the partition in more standarized way, respecting cylinder alignement: * The size of resulting image will be in cylinder multiple ~8MB. * Use fdisk instead of sfdisk (sfdisk write some bad information) * Make the result image in one pass, instead of concatenating. Also the advantage is that with this can add another partitions without any issues in the usb-flash-drive with this .img. For example of current situation: qemu-system-x86_64 -hda archlinux-avr.toolchain.img -serial stdio --------------------------------------------------------------------- [root@avr ~]# fdisk /dev/sda Command (m for help): p Disk /dev/sda: 223 MB, 223974400 bytes 59 heads, 41 sectors/track, 180 cylinders Units = cylinders of 2419 * 512 = 1238528 bytes Disk identifier: 0x00000000 Device Boot Start End Blocks Id System /dev/sda1 * 1 181 218693+ 83 Linux Partition 1 has different physical/logical beginnings (non-Linux?): phys=(0, 1, 1) logical=(0, 1, 23) Partition 1 has different physical/logical endings: phys=(27, 58, 41) logical=(180, 49, 21) Command (m for help): v Partition 1 has different physical/logical beginnings (non-Linux?): phys=(0, 1, 1) logical=(0, 1, 23) Partition 1 has different physical/logical endings: phys=(27, 58, 41) logical=(180, 49, 21) Partition 1: previous sectors 437449 disagrees with total 67731 62 unallocated 512-byte sectors Command (m for help): --------------------------------------------------------------------- qemu-system-x86_64 -hda archlinux-avr.toolchain-fix.img -serial stdio --------------------------------------------------------------------- [root@avr ~]# fdisk /dev/sda Command (m for help): p Disk /dev/sda: 230 MB, 230307840 bytes 255 heads, 63 sectors/track, 28 cylinders Units = cylinders of 16065 * 512 = 8225280 bytes Disk identifier: 0x5c94ca4f Device Boot Start End Blocks Id System /dev/sda1 * 1 28 224878+ 83 Linux Command (m for help): v 62 unallocated 512-byte sectors --------------------------------------------------------------------- Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
2009-08-25Added vfat support to mount /dev/archisoGerhard Brauer
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>
2009-08-10Fix mount loop test for bindingsAaron Griffin
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>
2009-08-10Ensure bootmnt is bound properly into device rootAaron Griffin
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>
2009-07-27Use a label when generating the image and pass it to the commandlineGerhard Brauer
This will generate a label ARCHISO_$randomstring using the pwgen utility and add this label to the kernel command line. A new label will be generated for each image, so it can be uniquely identified. Patch from brain0 <thomas@archlinux.org> Signed-off-by: Gerhard Brauer <gerbra@archlinux.de> Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-07-27Use the archisolabel= command line option to mount the archiso device.Gerhard Brauer
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>
2009-07-27Enabled -C option in mkarchisoGerhard Brauer
This flag allows to specify a own pacman.conf using during mkarchiso. Signed-off-by: Gerhard Brauer <gerbra@archlinux.de> Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-06-29Fix mkisofs quiet parameterGerhard Brauer
Option syntax for quiet mode in mkisofs has changed Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-06-12Fix a typo in the archiso hookSven-Hendrik Haase
remount,append=: should be remount,append: Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-06-08Updated deps, Makefile, TODOSven-Hendrik Haase
Done to better reflect and indicate current progress. Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-06-08Replace aufs 'add' with 'append'Aaron Griffin
Change via AUR package Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-04-17Missed aufs module in mkinitcpio install scriptAaron Griffin
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-04-14Replace unionfs with aufsAaron Griffin
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-01-30Fix a typo in the archiso-early hookAaron Griffin
Wrong slash! No idea how that happened :) Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-01-29Increment usbdelay by 1 before sleepingAaron Griffin
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>
2009-01-26Fix typos, formatting, and vague language where possible.Loui Chang
Signed-off-by: Loui Chang <louipc.ist@gmail.com> [Fixed menu.lst: LiveCD -> Live CD -aaron] Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-01-24Advanced USB delay handlingAaron Griffin
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>
2009-01-24Single quotes around find patterns during cleanupAaron Griffin
Whoops, *.img expands if we're building USB images. Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2009-01-24Add a manual sleep and rootdelayAaron Griffin
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>
2009-01-22Makefile fixes for 'install' targetØyvind Heggstad
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-12-24Remove a stray '_mksquash' echoAaron Griffin
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-12-24Fix usb image's size detectionAaron Griffin
Conversion issue when dropping mkusbimg. Use work_dir/iso to get the proper image size Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>