Commit graph

1433 commits

Author SHA1 Message Date
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
09435a2652 Apparently, we've never used this!
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-12-06 21:53:08 -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
45f1241d71 Add my "Too much crap in the Makefile" gripe to TODO
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-10-25 01:37:53 -05:00
Aaron Griffin
7b238c526a Merge branch 'master' of ssh://archlinux.org/srv/projects/git/archiso 2008-10-25 01:33:22 -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
efcdb592b6 More install ISO cleanup
More boot-file malarky done in the Makefile

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-10-25 01:30:51 -05:00
Aaron Griffin
a38a8eb38f Change mkinitcpio image names
Allow IDE/PATA selection on boot

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-10-25 00:56:19 -05:00
Aaron Griffin
9d32b14b29 Installer config fixups
Make sure we copy the boot directory we installed to the actual
ISO image. We need this for vmlinuz26 and the like...

Are we doing too much in the Makefile?

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-10-25 00:54:28 -05:00
Simo Leone
ed4085f3b2 Add note about $TIMEZONE
This is very important, rc.shutdown will jack
up settings made in the installer if $TIMEZONE
from rc.conf isn't empty.

Signed-off-by: Simo Leone <simo@archlinux.org>
2008-10-21 16:22:06 -05:00
Aaron Griffin
f6772b1dda TODO file additions
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-10-20 23:44:16 -05:00
Aaron Griffin
cd3e72ee68 Rework installer config to support new changes
Lots of changes, mainly for argument processing
and things of that nature in mkarchiso. Split out
some common functionality in the Maekfile as well.

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-10-20 23:41:54 -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
611c06daaa Default ISO config cleanup
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-10-19 23:05:58 -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
6f9cdf5958 Added Simo's XFCE4 config
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-09-06 23:54:38 -05:00
Aaron Griffin
59b50c5b80 Update install-iso versions
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-09-06 23:51:10 -05:00
Aaron Griffin
6cb784537a Rename default-config -> overlay
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-09-06 22:15:36 -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
00853df32b Convert to unified archiso hook
No longer any difference between USB and CD booting

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
2008-09-06 21:07: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
Simo Leone
99ed5349b3 Fix CD-ROM Ejection
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>
2008-06-21 19:06:42 -05:00
Simo Leone
a53cf77e3f Fix USB image corruption issues
Fixes FS#10614
sfdisk and the kernel cannot accurately detect
disk geometry from the disk image file, causing
automatic partition size calculations to fail.
The whole partition table is now calculated
in mkusbimg rather than letting sfdisk do it.

mkusbimg doesn't directly use losetup anymore
either, eliminating some code.

This also fixes issues with needing to make the
partition much larger than necessary, so image
size has been minimized.

Signed-off-by: Simo Leone <simo@archlinux.org>
2008-06-21 19:04:34 -05:00
Simo Leone
7315f8459d One more ide-cd fix
I missed a hook last time, so it was producing some
scary, but harmless output.

Signed-off-by: Simo Leone <simo@archlinux.org>
2008-06-20 00:17:03 -05:00
Simo Leone
a23e702eb6 Changed ide-cd to ide-cd_mod
Damnit 2.6.25

Signed-off-by: Simo Leone <simo@archlinux.org>
2008-05-17 02:12:38 -05:00
Simo Leone
e33c687400 modprobe loop module
udev doesn't modprobe loop by itself so we have
to ask it nicely.

Signed-off-by: Simo Leone <simo@archlinux.org>
2008-05-17 00:40:10 -05:00
Simo Leone
441d989243 Added loop module to archiso hook
Loopbacks became a module in 2.6.25.

Signed-off-by: Simo Leone <simo@archlinux.org>
2008-05-17 00:29:19 -05:00