The NetBSD Project

CVS log for src/usr.sbin/makefs/cd9660/cd9660_eltorito.c

[BACK] Up to [cvs.NetBSD.org] / src / usr.sbin / makefs / cd9660

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.25 / (download) - annotate - [select for diffs], Sat Apr 9 10:05:35 2022 UTC (9 months, 3 weeks ago) by riastradh
Branch: MAIN
CVS Tags: netbsd-10-base, netbsd-10, HEAD
Changes since 1.24: +7 -7 lines
Diff to previous 1.24 (colored)

makefs(8): Nix trailing whitespace.

Computed by machine, eyeballed by hand, so to speak.

Revision 1.24 / (download) - annotate - [select for diffs], Sun Nov 15 00:18:48 2020 UTC (2 years, 2 months ago) by jmcneill
Branch: MAIN
CVS Tags: cjep_sun2x-base1, cjep_sun2x-base, cjep_sun2x, cjep_staticlib_x-base1, cjep_staticlib_x-base, cjep_staticlib_x
Changes since 1.23: +14 -4 lines
Diff to previous 1.23 (colored)

Add "efi" as a supported boot image type and derive the platform ID for
the validation entry from the default boot image instead of hard-coding
X86.

Revision 1.21.4.1 / (download) - annotate - [select for diffs], Fri Mar 30 11:07:12 2018 UTC (4 years, 10 months ago) by martin
Branch: netbsd-8
CVS Tags: netbsd-8-2-RELEASE, netbsd-8-1-RELEASE, netbsd-8-1-RC1, netbsd-8-0-RELEASE, netbsd-8-0-RC2, netbsd-8-0-RC1
Changes since 1.21: +12 -2 lines
Diff to previous 1.21 (colored) next main 1.22 (colored)

Pull up following revision(s) (requested by nonaka in ticket #660):
	usr.sbin/makefs/cd9660/cd9660_eltorito.c: revision 1.22
	usr.sbin/makefs/cd9660/cd9660_eltorito.c: revision 1.23

Initialize boot_catalog_entry's entry_type properly.

This had been missing but the type was used in cd9660_setup_boot().
From OpenBSD usr.sbin/makefs/cd9660/cd9660_eltorito.c r1.10.

Correctly mark the last El Torito section header.
Pointed out by Benno Rice via DM.

Revision 1.22.2.1 / (download) - annotate - [select for diffs], Fri Mar 30 06:20:17 2018 UTC (4 years, 10 months ago) by pgoyette
Branch: pgoyette-compat
CVS Tags: pgoyette-compat-merge-20190127
Changes since 1.22: +8 -2 lines
Diff to previous 1.22 (colored) next main 1.23 (colored)

Resolve conflicts between branch and HEAD

Revision 1.23 / (download) - annotate - [select for diffs], Wed Mar 28 06:48:55 2018 UTC (4 years, 10 months ago) by nonaka
Branch: MAIN
CVS Tags: phil-wifi-base, phil-wifi-20200421, phil-wifi-20200411, phil-wifi-20200406, phil-wifi-20191119, phil-wifi-20190609, phil-wifi, pgoyette-compat-20190127, pgoyette-compat-20190118, pgoyette-compat-1226, pgoyette-compat-1126, pgoyette-compat-1020, pgoyette-compat-0930, pgoyette-compat-0906, pgoyette-compat-0728, pgoyette-compat-0625, pgoyette-compat-0521, pgoyette-compat-0502, pgoyette-compat-0422, pgoyette-compat-0415, pgoyette-compat-0407, pgoyette-compat-0330, netbsd-9-base, netbsd-9-3-RELEASE, netbsd-9-2-RELEASE, netbsd-9-1-RELEASE, netbsd-9-0-RELEASE, netbsd-9-0-RC2, netbsd-9-0-RC1, netbsd-9, is-mlppp-base, is-mlppp
Changes since 1.22: +8 -2 lines
Diff to previous 1.22 (colored)

Correctly mark the last El Torito section header.

Pointed out by Benno Rice via DM.

Revision 1.22 / (download) - annotate - [select for diffs], Thu Nov 9 01:28:05 2017 UTC (5 years, 2 months ago) by nonaka
Branch: MAIN
CVS Tags: pgoyette-compat-base, pgoyette-compat-0322, pgoyette-compat-0315
Branch point for: pgoyette-compat
Changes since 1.21: +6 -2 lines
Diff to previous 1.21 (colored)

Initialize boot_catalog_entry's entry_type properly.

This had been missing but the type was used in cd9660_setup_boot().

From OpenBSD usr.sbin/makefs/cd9660/cd9660_eltorito.c r1.10.

Revision 1.20.16.1 / (download) - annotate - [select for diffs], Fri Apr 21 16:54:17 2017 UTC (5 years, 9 months ago) by bouyer
Branch: bouyer-socketcan
Changes since 1.20: +46 -12 lines
Diff to previous 1.20 (colored) next main 1.21 (colored)

Sync with HEAD

Revision 1.20.12.1 / (download) - annotate - [select for diffs], Mon Mar 20 06:58:07 2017 UTC (5 years, 10 months ago) by pgoyette
Branch: pgoyette-localcount
Changes since 1.20: +46 -12 lines
Diff to previous 1.20 (colored) next main 1.21 (colored)

Sync with HEAD

Revision 1.21 / (download) - annotate - [select for diffs], Tue Jan 24 11:22:43 2017 UTC (6 years ago) by nonaka
Branch: MAIN
CVS Tags: prg-localcount2-base3, prg-localcount2-base2, prg-localcount2-base1, prg-localcount2-base, prg-localcount2, pgoyette-localcount-20170426, pgoyette-localcount-20170320, perseant-stdc-iso10646-base, perseant-stdc-iso10646, netbsd-8-base, matt-nb8-mediatek-base, matt-nb8-mediatek, bouyer-socketcan-base1
Branch point for: netbsd-8
Changes since 1.20: +46 -12 lines
Diff to previous 1.20 (colored)

makefs(8): add cd9660 eltorito-alt-boot option for EFI boot.

Revision 1.17.2.3 / (download) - annotate - [select for diffs], Thu May 22 11:43:05 2014 UTC (8 years, 8 months ago) by yamt
Branch: yamt-pagecache
Changes since 1.17.2.2: +61 -80 lines
Diff to previous 1.17.2.2 (colored) to branchpoint 1.17 (colored) next main 1.18 (colored)

sync with head.

for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.

this commit was splitted into small chunks to avoid
a limitation of cvs.  ("Protocol error: too many arguments")

Revision 1.19.2.1 / (download) - annotate - [select for diffs], Mon Feb 25 00:30:44 2013 UTC (9 years, 11 months ago) by tls
Branch: tls-maxphys
Changes since 1.19: +61 -80 lines
Diff to previous 1.19 (colored) next main 1.20 (colored)

resync with head

Revision 1.20 / (download) - annotate - [select for diffs], Mon Jan 28 21:03:28 2013 UTC (10 years ago) by christos
Branch: MAIN
CVS Tags: yamt-pagecache-base9, tls-maxphys-base, tls-earlyentropy-base, tls-earlyentropy, riastradh-xf86-video-intel-2-7-1-pre-2-21-15, riastradh-drm2-base3, riastradh-drm2-base2, riastradh-drm2-base1, riastradh-drm2-base, riastradh-drm2, pgoyette-localcount-base, pgoyette-localcount-20170107, pgoyette-localcount-20161104, pgoyette-localcount-20160806, pgoyette-localcount-20160726, netbsd-7-nhusb-base-20170116, netbsd-7-nhusb-base, netbsd-7-nhusb, netbsd-7-base, netbsd-7-2-RELEASE, netbsd-7-1-RELEASE, netbsd-7-1-RC2, netbsd-7-1-RC1, netbsd-7-1-2-RELEASE, netbsd-7-1-1-RELEASE, netbsd-7-1, netbsd-7-0-RELEASE, netbsd-7-0-RC3, netbsd-7-0-RC2, netbsd-7-0-RC1, netbsd-7-0-2-RELEASE, netbsd-7-0-1-RELEASE, netbsd-7-0, netbsd-7, localcount-20160914, bouyer-socketcan-base, agc-symver-base, agc-symver
Branch point for: pgoyette-localcount, bouyer-socketcan
Changes since 1.19: +61 -80 lines
Diff to previous 1.19 (colored)

- use emalloc and friends
- kill a bunch of global variables, more work to be done here
- homogenize option parsing. more work for cd9660
- use the new options parsing code to print an fs-specific usage

Revision 1.17.2.2 / (download) - annotate - [select for diffs], Wed May 23 10:08:29 2012 UTC (10 years, 8 months ago) by yamt
Branch: yamt-pagecache
CVS Tags: yamt-pagecache-tag8
Changes since 1.17.2.1: +3 -3 lines
Diff to previous 1.17.2.1 (colored) to branchpoint 1.17 (colored)

sync with head.

Revision 1.19 / (download) - annotate - [select for diffs], Thu Apr 19 17:28:25 2012 UTC (10 years, 9 months ago) by christos
Branch: MAIN
CVS Tags: yamt-pagecache-base8, yamt-pagecache-base7, yamt-pagecache-base6, yamt-pagecache-base5
Branch point for: tls-maxphys
Changes since 1.18: +3 -3 lines
Diff to previous 1.18 (colored)

WARNS=5

Revision 1.17.2.1 / (download) - annotate - [select for diffs], Tue Apr 17 00:09:49 2012 UTC (10 years, 9 months ago) by yamt
Branch: yamt-pagecache
Changes since 1.17: +33 -10 lines
Diff to previous 1.17 (colored)

sync with head

Revision 1.18 / (download) - annotate - [select for diffs], Mon Apr 2 19:01:21 2012 UTC (10 years, 10 months ago) by christos
Branch: MAIN
CVS Tags: yamt-pagecache-base4
Changes since 1.17: +33 -10 lines
Diff to previous 1.17 (colored)

Pull FreeBSD fix from Andreas Tobbler:

- Write the ISO9660 descriptor after the apm partition entries.
- Fill the needed pmPartStatus flags. At least the OpenBIOS
  implementation relies on these flags.

This commit fixes the panic seen on OS-X when inserting a FreeBSD/ppc disc.
Additionally OpenBIOS recognizes the partition where the boot code is located.
This lets us load a FreeBSD/ppc PowerMac kernel inside qemu.

Revision 1.17 / (download) - annotate - [select for diffs], Thu Jun 23 02:35:56 2011 UTC (11 years, 7 months ago) by enami
Branch: MAIN
CVS Tags: yamt-pagecache-base3, yamt-pagecache-base2, yamt-pagecache-base, netbsd-6-base, netbsd-6-1-RELEASE, netbsd-6-1-RC4, netbsd-6-1-RC3, netbsd-6-1-RC2, netbsd-6-1-RC1, netbsd-6-1-5-RELEASE, netbsd-6-1-4-RELEASE, netbsd-6-1-3-RELEASE, netbsd-6-1-2-RELEASE, netbsd-6-1-1-RELEASE, netbsd-6-1, netbsd-6-0-RELEASE, netbsd-6-0-RC2, netbsd-6-0-RC1, netbsd-6-0-6-RELEASE, netbsd-6-0-5-RELEASE, netbsd-6-0-4-RELEASE, netbsd-6-0-3-RELEASE, netbsd-6-0-2-RELEASE, netbsd-6-0-1-RELEASE, netbsd-6-0, netbsd-6, matt-nb6-plus-nbase, matt-nb6-plus-base, matt-nb6-plus
Branch point for: yamt-pagecache
Changes since 1.16: +2 -4 lines
Diff to previous 1.16 (colored)

Move inclusion of sys/endian.h from cd9660_eltorito.c to cd9660.h
since actual user is not cd9660_eltorito.c but iso.h and
cd9660_eltorito.h.

Actually, include order/place of sys/endian.h doesn't matter on
netbsd since it is always included by sys/types.h but it's not
true on other system.  This should fix cross build breakage on
freebsd introduced by rev. 1.16 of cd9660_eltorito.c.
Problem reported and fix suggested on twitter.

Revision 1.16 / (download) - annotate - [select for diffs], Mon May 23 00:21:50 2011 UTC (11 years, 8 months ago) by christos
Branch: MAIN
CVS Tags: cherry-xenmp-base, cherry-xenmp
Changes since 1.15: +4 -3 lines
Diff to previous 1.15 (colored)

include system headers after config.h

Revision 1.15 / (download) - annotate - [select for diffs], Sun May 22 21:51:39 2011 UTC (11 years, 8 months ago) by christos
Branch: MAIN
Changes since 1.14: +156 -2 lines
Diff to previous 1.14 (colored)

From Nathan Whitehorn (nwhitehorn at freebsd dot org):
Add code to generate bootable ISOs on Powermac and CHRP systems.
Synthesize some partition maps (APM and MBR, respectively) pointing
to (a) the whole disk, and (b) relevant El Torito boot images that
have been added by other code. These partition maps are a little
bit funny looking, but they seem to work. FreeBSD has been using
this successfully in their release generation on powerpc, as well
as generating all non-SPARC install media. SPARC support could
probably be added as an extension of this patch.

Revision 1.14 / (download) - annotate - [select for diffs], Wed Oct 27 18:51:35 2010 UTC (12 years, 3 months ago) by christos
Branch: MAIN
CVS Tags: matt-mips64-premerge-20101231, bouyer-quota2-nbase, bouyer-quota2-base, bouyer-quota2
Changes since 1.13: +3 -3 lines
Diff to previous 1.13 (colored)

Handle > 2GB images. Thanks to Greg Troxel for testing!

Revision 1.13 / (download) - annotate - [select for diffs], Fri Oct 22 00:49:15 2010 UTC (12 years, 3 months ago) by christos
Branch: MAIN
Changes since 1.12: +5 -4 lines
Diff to previous 1.12 (colored)

- simple fseek->fseeko conversion. probably needs more work.
- use a constant instead of sprinkling 2048 everywhere.

Revision 1.11.20.1 / (download) - annotate - [select for diffs], Thu Sep 18 04:30:07 2008 UTC (14 years, 4 months ago) by wrstuden
Branch: wrstuden-revivesa
Changes since 1.11: +3 -3 lines
Diff to previous 1.11 (colored) next main 1.12 (colored)

Sync with wrstuden-revivesa-base-2.

Revision 1.12 / (download) - annotate - [select for diffs], Sun Jul 27 10:29:32 2008 UTC (14 years, 6 months ago) by reinoud
Branch: MAIN
CVS Tags: wrstuden-revivesa-base-3, wrstuden-revivesa-base-2, netbsd-5-base, netbsd-5-2-RELEASE, netbsd-5-2-RC1, netbsd-5-2-3-RELEASE, netbsd-5-2-2-RELEASE, netbsd-5-2-1-RELEASE, netbsd-5-2, netbsd-5-1-RELEASE, netbsd-5-1-RC4, netbsd-5-1-RC3, netbsd-5-1-RC2, netbsd-5-1-RC1, netbsd-5-1-5-RELEASE, netbsd-5-1-4-RELEASE, netbsd-5-1-3-RELEASE, netbsd-5-1-2-RELEASE, netbsd-5-1-1-RELEASE, netbsd-5-1, netbsd-5-0-RELEASE, netbsd-5-0-RC4, netbsd-5-0-RC3, netbsd-5-0-RC2, netbsd-5-0-RC1, netbsd-5-0-2-RELEASE, netbsd-5-0-1-RELEASE, netbsd-5-0, netbsd-5, matt-premerge-20091211, matt-nb5-pq3-base, matt-nb5-pq3, matt-nb5-mips64-u2-k2-k4-k7-k8-k9, matt-nb5-mips64-u1-k1-k5, matt-nb5-mips64-premerge-20101231, matt-nb5-mips64-premerge-20091211, matt-nb5-mips64-k15, matt-nb5-mips64, matt-nb4-mips64-k7-u2a-k9b, matt-mips64-base2, jym-xensuspend-nbase, jym-xensuspend-base, jym-xensuspend
Changes since 1.11: +3 -3 lines
Diff to previous 1.11 (colored)

Fix typo in cd9660 functionname cd9660_setup_boot_volume_descritpor ->
cd9660_setup_boot_volume_descriptor.

Interestingly the same typo was used in 3 files!

Revision 1.11 / (download) - annotate - [select for diffs], Sat Apr 22 17:38:20 2006 UTC (16 years, 9 months ago) by christos
Branch: MAIN
CVS Tags: yamt-pf42-baseX, yamt-pf42-base4, yamt-pf42-base3, yamt-pf42-base2, yamt-pf42-base, yamt-pf42, wrstuden-revivesa-base-1, wrstuden-revivesa-base, wrstuden-fixsa-newbase, wrstuden-fixsa-base-1, wrstuden-fixsa-base, wrstuden-fixsa, netbsd-4-base, netbsd-4-0-RELEASE, netbsd-4-0-RC5, netbsd-4-0-RC4, netbsd-4-0-RC3, netbsd-4-0-RC2, netbsd-4-0-RC1, netbsd-4-0-1-RELEASE, netbsd-4-0, netbsd-4, matt-mips64-base, matt-mips64, matt-armv6-prevmlocking, matt-armv6-nbase, matt-armv6-base, matt-armv6, keiichi-mipv6-nbase, keiichi-mipv6-base, keiichi-mipv6, hpcarm-cleanup-nbase, hpcarm-cleanup-base, hpcarm-cleanup, cube-autoconf-base, cube-autoconf, abandoned-netbsd-4-base, abandoned-netbsd-4
Branch point for: wrstuden-revivesa
Changes since 1.10: +8 -2 lines
Diff to previous 1.10 (colored)

Coverity CID 548: Fix resource leak.

Revision 1.10 / (download) - annotate - [select for diffs], Mon Oct 31 23:21:25 2005 UTC (17 years, 3 months ago) by dyoung
Branch: MAIN
Changes since 1.9: +4 -3 lines
Diff to previous 1.9 (colored)

Oops, condition another printf on verbose_level > 0.

Revision 1.9 / (download) - annotate - [select for diffs], Mon Oct 31 23:19:54 2005 UTC (17 years, 3 months ago) by dyoung
Branch: MAIN
Changes since 1.8: +36 -19 lines
Diff to previous 1.8 (colored)

Condition several cd9660 printfs on verbose_level > 0.  Silences
makefs -t cd9660.

Revision 1.8 / (download) - annotate - [select for diffs], Sun Oct 30 07:33:57 2005 UTC (17 years, 3 months ago) by dyoung
Branch: MAIN
Changes since 1.7: +42 -47 lines
Diff to previous 1.7 (colored)

Now that I understand what order boot-images and boot-entries are
intended to be kept on the boot-images and -entries lists, keep
them in that order: images grouped and entries grouped by system,
with later images nearer the front of the list.

*Really* apply boot options to the last boot-image specified.

Revision 1.7 / (download) - annotate - [select for diffs], Sun Oct 30 06:45:46 2005 UTC (17 years, 3 months ago) by dyoung
Branch: MAIN
Changes since 1.6: +57 -38 lines
Diff to previous 1.6 (colored)

Bug fix: record the actual number number of 512-byte "virtual"
sectors in the Sector Count field of the Initial/Default Entry in
the "El Torito" Boot Catalog, instead of blithely writing 1 (!!)
into the Sector Count field.  Ditto the Section Entries.

Remove last remnants of cd9660's unsupported boot-load-size option.

Really use cd9660's boot-load-segment argument.

Change the boot images list from a LIST to a TAILQ.

Re-implement CD9660_BLOCKS() with howmany().

Introduce ELTORITO_DPRINTF and some debug messages.

Zero memory malloc'd in the El Torito code.

Revise some debugging outputs.

Insert a new boot-image on the boot-images list after the last
boot-image for the same architecture.  It makes a (trivial) functional
difference.

Miscellaneous cosmetic changes.  Remove useless variable-assignment.

Revision 1.6 / (download) - annotate - [select for diffs], Sun Oct 30 03:50:54 2005 UTC (17 years, 3 months ago) by dyoung
Branch: MAIN
Changes since 1.5: +46 -40 lines
Diff to previous 1.5 (colored)

Cosmetic: add temporary variables for lengthy, repeated clauses
like 'default_entry->entry_data.IE'.  KNF.

Revision 1.5 / (download) - annotate - [select for diffs], Sun Oct 30 03:10:28 2005 UTC (17 years, 3 months ago) by dyoung
Branch: MAIN
Changes since 1.4: +48 -48 lines
Diff to previous 1.4 (colored)

Remove invisible whitespace at ends of lines that disrupted my
speedy cursor-movement habits in vi.

Revision 1.4 / (download) - annotate - [select for diffs], Fri Oct 28 21:54:21 2005 UTC (17 years, 3 months ago) by dyoung
Branch: MAIN
Changes since 1.3: +4 -3 lines
Diff to previous 1.3 (colored)

Correct strcmp(3) usage (expect equal -> 0).

Revision 1.3 / (download) - annotate - [select for diffs], Fri Oct 28 21:51:35 2005 UTC (17 years, 3 months ago) by dyoung
Branch: MAIN
Changes since 1.2: +23 -30 lines
Diff to previous 1.2 (colored)

Use LIST_ macros instead of accessing list structure members lh_first
and le_next directly.

Revision 1.2 / (download) - annotate - [select for diffs], Fri Aug 19 01:24:21 2005 UTC (17 years, 5 months ago) by dyoung
Branch: MAIN
Changes since 1.1: +27 -31 lines
Diff to previous 1.1 (colored)

Change from malloc/strcpy idiom to strdup.

Revamp err, errx, warn, warnx usage.

Misc. cosmetic tweaks.

Make -o bootimage=sysname;filename expect NetBSD architecture names
(x86 -> i386; mac -> {macppc, mac68k}; ppc -> powerpc) for sysname.

Revision 1.1 / (download) - annotate - [select for diffs], Sat Aug 13 01:53:01 2005 UTC (17 years, 5 months ago) by fvdl
Branch: MAIN

cd9660 support. Written by Daniel Watt, Walter Deignan, Ryan Gabrys,
Alan Perez-Rathke and Ram Vedam.

Prototyping, KNF, WARNS=3 by me.

Note that this is marked experimental for now. It works well enough to
make NetBSD/i386 bootable images, but does need more work.

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.




CVSweb <webmaster@jp.NetBSD.org>