Commit Graph

23 Commits

Author SHA1 Message Date
Will Woods
5437557846 Don't set a root= argument (#837208)
Using root= overrides the anaconda magic code for finding product.img
and updates.img. Anaconda can find the CDROM itself without needing
root=, though, so we can omit it safely for boot.iso.
2012-07-10 09:58:48 +02:00
Martin Gracik
7ba6af6d29 Copy mapping and magic to BOOTDIR on ppc (#815550) 2012-05-25 13:47:33 +02:00
Martin Gracik
4762c45b22 Fix product name replacing in templates (#799919)
The product name may contain spaces, so it needs
to be in quotes, otherwise the other words get stripped.
2012-03-30 13:22:45 -07:00
Martin Gracik
bbd758d998 Change the squashfs image section in .treeinfo
Related: rhbz#782108
2012-02-09 16:59:15 +01:00
Martin Gracik
cb6d0758d9 Add path to squashfs image to the treeinfo
Related: rhbz#782108
2012-02-09 16:28:03 +01:00
Will Woods
27dda6eae6 ppc.tmpl: work around yaboot's crippling fear of backslashes
If yaboot so much as catches a whiff of a backslash in yaboot.conf, it
will reject the entire file. No bootloader config means no booting.

So as long as we're still using yaboot on PPC, we need to use ISO volume
labels it can handle. So: filter the isolabel, replacing any non-ASCII
characters with underscores.
2011-11-16 15:18:47 -05:00
Will Woods
86937d2c0a ppc.tmpl: clarify comments, fix yaboot.conf for Apple systems
So there's actually two copies of yaboot on a PPC image, and they each
use different config files:

  ppc/chrp/yaboot --> /etc/yaboot.conf
  ppc/mac/yaboot  --> /ppc/ppc{32,64}/yaboot.conf

So we need two copies of yaboot.conf - one in each place - to
boot properly (or all three if we're making hybrid images). Whee!

The comments should now make this more clear for future reference.
2011-11-16 15:17:39 -05:00
Will Woods
0236440581 clean up config_files dir (and fix templates to match)
move arch-specific stuff to arch-specific subdirs and move all the
common stuff to a subdir named 'common'. Also, rename '.profile' and
'.bash_history' so you actually see them when you 'ls' the 'common' dir.

also added some helpful(?) comments to the templates.
2011-10-21 17:35:52 -04:00
Will Woods
f640a2faab Use a predictable ISO Volume Label (#732298)
New images find their root device by looking at the CDLABEL. Since pungi
is building ISO images separately from lorax, if it uses a different ISO
Volume Label we'll end up with unbootable images.

This changes the volume labels to match what pungi uses, so both should
boot OK.
2011-10-12 20:21:06 -04:00
Will Woods
9df3348a71 Move images/install.img to LiveOS/squashfs.img (#732298)
Since pungi doesn't know that images/install.img needs to be moved to
LiveOS/squashfs.img for images to be "live", they aren't bootable.

This is the simple solution to the problem. Thanks to Karsten Hopp
for the original patch.
2011-10-11 14:58:30 -04:00
Will Woods
f7010454a0 minor ppc.tmpl cleanups 2011-08-08 21:11:28 -04:00
Will Woods
058fa13a54 rename ANABOOTDIR to configdir 2011-08-08 20:35:35 -04:00
Will Woods
fbd23c4234 add boot config files from anaconda to configdir
This adds the boot config files from anaconda to lorax's configdir.

They've been edited to include a '@ROOT@' placeholder, so lorax can put
the proper root=... argument in place, and to use the @VAR@ convention
everywhere (instead of some using @VAR@ and some using %VAR%).

This should probably fix EFI booting, since the EFI BOOT*.conf was
missing its root=... arg.

Also some default settings were changed in syslinux.cfg (so we don't
have to rewrite those two lines every time).

One last change - the '-magic' arg and ppc 'magic' file have been
dropped, because that's kind of silly and unnecessary.
2011-08-08 20:09:32 -04:00
Will Woods
913fffbfa9 Use graft-points in ppc.tmpl 2011-07-25 20:09:54 -04:00
Will Woods
f1b5c77e50 Add <%page args="..."/> to templates 2011-07-25 19:39:48 -04:00
Will Woods
2fcb05883b scads of ppc.tmpl fixes 2011-07-05 19:37:26 -04:00
Will Woods
a2b6b53cf3 ppc.tmpl fix: %endif, not %fi (what is this, bash?) 2011-07-05 14:06:13 -04:00
Will Woods
c5bfdf0e71 ppc.tmpl: clean up zimage building
remove deprecated "mkzimage" stuff (gone since F10)
clean up the call to 'wrapper'
assume we'll always build zimages
2011-07-01 13:05:11 -04:00
Will Woods
d1266ff4e9 x86,ppc: add "root=live:CDLABEL=..." boot arg to CD images
The current implementation is hacky and gross; we should at least update
the bootloader files in anaconda to have a %ROOT% param in them.
2011-06-27 19:22:33 -04:00
Will Woods
8122690ab9 runtime is images/install.img, or LiveOS/squashfs.img on boot.iso
rename the runtime image in the tree and on the ISO.
2011-06-24 17:26:01 -04:00
Will Woods
b73132af75 rename "runtime" template arg to "runtime_img"
Mako uses "runtime" internally for things, and if you clobber it stuff
will just break in weird ways. So don't do that.
2011-06-23 10:46:28 -04:00
Will Woods
5eb6c9b12f arch templates: install runtime to /images/, put it on boot.iso
make sure the arch templates (s390 excluded) copy the runtime image in
to the /images/ dir, and make sure it gets grafted/copied into the
boot.iso.
2011-06-22 20:37:09 -04:00
Will Woods
1350cd028f treebuilder.py: uses templates to create trees/images
TreeBuilder uses templates full of commands (like ramdisk.ltmpl) to
create the output tree and boot images. There are 4 arch-specific
templates, plus a bonus EFI template which can handle EFI image creation
for any arch that implements EFI.
2011-05-09 15:33:54 -04:00