Commit Graph

397 Commits

Author SHA1 Message Date
Aaron Griffin
4dc9b68e4d Remove a stray '_mksquash' echo
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-12-24 10:45:05 -08:00
Aaron Griffin
fbd2ce5cb0 Fix usb image's size detection
Conversion issue when dropping mkusbimg. Use work_dir/iso
to get the proper image size

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-12-24 10:33:36 -08:00
Aaron Griffin
571aa15309 Fix the way squashfs mountpoints are handled
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>
2008-12-23 20:12:20 -08:00
Gerhard Brauer
f7d183588c Fix the last "device exists check"
Looks like my last-minute addition was goofed.
Use && not ||

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-12-23 07:36:54 -08:00
Aaron Griffin
32a1991679 Properly remove the usb image's tmpdir
Guess what? rm -f won't remove a dir. Whoops

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-12-23 00:33:46 -08:00
Aaron Griffin
f47fde8485 Fix some intending errors in USB creation
This was causing sfdisk and grub to balk

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-12-23 02:23:22 -06:00
Aaron Griffin
29f5c0373c Add existence checks to the boot-media scan
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>
2008-12-23 02:17:59 -06:00
Aaron Griffin
2a58a09f8c README and isomounts additions on creation
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-12-23 00:52:18 -06:00
Aaron Griffin
f1c46e0d3f Cleanup archiso hook
Fix squashfs mounting of all isomounts images, along
with a few other changes

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-12-23 00:51:20 -06:00
Aaron Griffin
978fdafbff Allow specifying of pacman.conf file in mkarchiso
Use the -C flag to allow us to build alternate isos on
a different architecture and things of the sort

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-12-21 02:24:39 -06:00
Aaron Griffin
97f4dcec81 Re-add the if-check that includes grub-gfx
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-12-19 23:30:53 -06:00
Aaron Griffin
485838e9a9 Remove host system package checks
Not needed as we ensure files are in the ISO dir

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-12-19 23:26:45 -06:00
Aaron Griffin
a3fc771d90 Add bootloader requirements to the README
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-12-19 23:24:18 -06:00
Aaron Griffin
43191485ed Remove mkusbimg from the install Makefile
Merged into mkarchiso now

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-12-18 22:13:24 -06:00
Aaron Griffin
4e638eaf24 Final changes for new nextgen scripts
Too much to list. Just look at the diff 8)

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-12-18 22:09:19 -06:00
Aaron Griffin
fe517fb0fc Fix isolinux support (pkgname)
Package name is 'syslinux'

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-12-18 22:09:18 -06:00
Aaron Griffin
f918440da1 Rework the commands, create and iso
Initial changes to get 'create' working as intended.

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-12-18 22:09:17 -06:00
Aaron Griffin
901526970e Change mounts file to isomounts
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>
2008-12-18 22:09:17 -06:00
Aaron Griffin
88ae858f51 Support mutli-arch disks by specifying the arch
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>
2008-12-18 22:09:17 -06:00
Aaron Griffin
70bc4b6863 Modprobe loop module before use in mkusbimg
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-11-24 19:15:22 -08:00
Simo Leone
0a8b401685 Update archiso hook to match root image naming
It's called root-image.sqfs rather than
archiso.sqfs nowadays.

Signed-off-by: Simo Leone <simo@archlinux.org>
2008-11-13 03:51:12 -06:00
Simo Leone
460b0f1edc Fix loop device mounting
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>
2008-11-13 03:49:25 -06:00
Simo Leone
7f1a141136 Fix CD-ROM mounting
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>
2008-11-13 03:47:58 -06:00
Aaron Griffin
dee0d28205 Fail to a shell if boot device not found
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-10-30 02:07:06 -05:00
Aaron Griffin
ee900303ae Move grub/isolinux stuff to Makefile level
Again, in an attempt to make this feel cleaner, I've moved
more out to the makefile level. Not sure I'm happy with that
but it works for now

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-10-25 01:32:12 -05:00
Aaron Griffin
142c257323 Fix archiso hook to deal with new udev
udetrigger and udevsettle replaced by udevadm

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-10-25 01:31:37 -05:00
Aaron Griffin
071b3454a0 Rework image creation
Allow for grub, grub-gfx, or isolinux support
(isolinux support still pending, skeleton is in place)

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-10-20 23:41:05 -05:00
Aaron Griffin
c8df7387dd Trim spaces from the package list before using
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-10-20 23:40:43 -05:00
Aaron Griffin
d8f4565b89 Minor modifications to usage output
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-10-20 23:40:17 -05:00
Aaron Griffin
3f5c116d8c Enable mkinitcpio hook to use the 'mounts' file
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-10-20 23:39:43 -05:00
Aaron Griffin
2b6515271d Remove mkinitcpio functionality
We don't want to tie the archiso scripts to the way the ISO
should boot the live system. This can and should be done at
the build (Makefile) level beforehand

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-10-19 23:31:50 -05:00
Aaron Griffin
f3110a21eb Move mountfile copying code
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-10-19 23:18:16 -05:00
Aaron Griffin
eb6693901d Rename 'img' command to 'image'
Additionally, remove the "all" command

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-10-19 23:08:34 -05:00
Aaron Griffin
bba27fbe4a Default IMG_TYPE to 'iso'
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-10-19 23:06:35 -05:00
Aaron Griffin
b4d60a7ccb Fail install if no packages specified
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-10-19 22:40:36 -05:00
Aaron Griffin
61d0a83113 Code cleanup: usage and comments
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-10-19 22:40:06 -05:00
Aaron Griffin
6989ceb442 Minor documentation updates
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-10-19 22:39:35 -05:00
Aaron Griffin
e7a7902104 Add some config output on calling mkarchiso
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-10-19 19:57:09 -05:00
Aaron Griffin
00848934b6 Remove all 'package file' usage in favor of command line packages
This is just simpler and more intuitive. Shell tools can easily
be used to install from a file. For instance:
   $ mkarciso ... -p "$(cat package-file)"

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-10-19 19:51:48 -05:00
Aaron Griffin
c2ffda39f9 Rename all uses of 'archlive' to 'archiso'
Additionally change grub prompts to use "ArchLinux LiveCD"
as the boot item name

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-10-19 15:49:55 -05:00
Aaron Griffin
f3c061b541 Capitalize "global" variables IMGROOT and INSTROOT
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-09-13 23:20:47 -05:00
Aaron Griffin
b7d7a9fcdf Refactor commands out into functions (for the future)
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-09-13 23:18:10 -05:00
Aaron Griffin
781b520dbf Makefile cleanup
Use -D flag for install binary instead of mkdir
Remove old boot-{cd,usb} hooks

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-09-06 22:11:41 -05:00
Aaron Griffin
0d3f3f0183 Make gen_grubscan executable
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-09-06 22:09:57 -05:00
Aaron Griffin
9417199206 Unify initcpio hooks to one glorious archiso hook
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-09-06 21:06:39 -05:00
Aaron Griffin
98318ea039 Rename "default-config" to "overlay"
I like difficulty and then name was annoying me

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-09-06 20:45:45 -05:00
Aaron Griffin
8966351b12 Split mkarchiso and configs into logical parts
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-09-06 20:39:35 -05:00