summaryrefslogtreecommitdiffstats
path: root/usr.sbin/makefs
Commit message (Collapse)AuthorAgeFilesLines
* makefs: Provide a -T option to set timestamps to a consistent valueemaste2016-06-148-54/+129
| | | | | | | | | | | | This is taken from the NetBSD versions listed below and adapted to the makefs version in FreeBSD, along with a bug fix from cem@ that will be sent to NetBSD. Reviewed by: pfg Approved by: re (gjb) Obtained from: NetBSD MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D6835
* Initialize date of rootNode.sjg2016-05-181-0/+3
| | | | Reviewed by: jtl
* makefs(8): Clarify the comment concerning seeding.pfg2016-05-181-1/+4
| | | | | Avoid giving the impression makefs currently supports reproduceable builds.
* makefs(1): use all the random(3) range.pfg2016-05-171-1/+2
| | | | | | | | | | | | The generation number is uint32_t so we can fit the complete range of random(3). We could have used arc4random() but the result would be unpredictable and it would prohibit reproducible builds. While here add a comment where seeding is done: this affects reproducible builds and might have to be re-visited to use a release dependent value. MFC after: 2 weeks
* makefs(8): use NULL instead of zero for pointers.pfg2016-05-171-5/+5
|
* Fix an off by one error to avoid overflowing rp[].truckman2016-05-161-1/+1
| | | | | Reported by: Coverity CID: 1007579
* ffs_bswap: Copy one UFS dinode member at a timecem2016-05-111-2/+5
| | | | | | | | No functional change. Reported by: Coverity CIDs: 974635, 974636, 977396, 977397, 977398, 977399 Sponsored by: EMC / Isilon Storage Division
* Merge ^/user/ngie/release-pkg-fix-tests to unbreak how test files are installedngie2016-05-041-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after r298107 Summary of changes: - Replace all instances of FILES/TESTS with ${PACKAGE}FILES. This ensures that namespacing is kept with FILES appropriately, and that this shouldn't need to be repeated if the namespace changes -- only the definition of PACKAGE needs to be changed - Allow PACKAGE to be overridden by callers instead of forcing it to always be `tests`. In the event we get to the point where things can be split up enough in the base system, it would make more sense to group the tests with the blocks they're a part of, e.g. byacc with byacc-tests, etc - Remove PACKAGE definitions where possible, i.e. where FILES wasn't used previously. - Remove unnecessary TESTSPACKAGE definitions; this has been elided into bsd.tests.mk - Remove unnecessary BINDIRs used previously with ${PACKAGE}FILES; ${PACKAGE}FILESDIR is now automatically defined in bsd.test.mk. - Fix installation of files under data/ subdirectories in lib/libc/tests/hash and lib/libc/tests/net/getaddrinfo - Remove unnecessary .include <bsd.own.mk>s (some opportunistic cleanup) Document the proposed changes in share/examples/tests/tests/... via examples so it's clear that ${PACKAGES}FILES is the suggested way forward in terms of replacing FILES. share/mk/bsd.README didn't seem like the appropriate method of communicating that info. MFC after: never probably X-MFC with: r298107 PR: 209114 Relnotes: yes Tested with: buildworld, installworld, checkworld; buildworld, packageworld Sponsored by: EMC / Isilon Storage Division
* Use MIN/MAX macros from sys/param.h.araujo2016-05-021-3/+2
| | | | MFC after: 2 weeks.
* The malloc will return NULL if it can't allocate memory.araujo2016-04-181-1/+1
| | | | MFC after: 2 weeks.
* MFHgjb2016-03-101-0/+11
|\ | | | | | | Sponsored by: The FreeBSD Foundation
| * DIRDEPS_BUILD: Connect MK_TESTS.bdrewery2016-03-091-0/+11
| | | | | | | | Sponsored by: EMC / Isilon Storage Division
* | First pass to fix the 'tests' packages.gjb2016-02-021-0/+4
|/ | | | Sponsored by: The FreeBSD Foundation
* Require /sbin/mount_cd9660 when running the cd9660 testsngie2016-01-271-0/+2
| | | | | | | | | | In some cases the test system might not have mount_cd9660(8). Don't implicitly rely on it while testing cd9660 support; explicitly rely on it MFC after: 1 week Reported by: mjohnston Sponsored by: EMC / Isilon Storage Division
* Fix getopt(3) argument after r290180; I forgot to change -r to -Rngie2015-12-291-1/+1
| | | | | | | | | by accident MFC after: 3 days Pointyhat to: ngie Reported by: vangyzen Sponsored by: EMC / Isilon Storage Division
* makefs: use ENTRY macro for diff reduction with NetBSDemaste2015-12-211-3/+6
| | | | Sponsored by: The FreeBSD Foundation
* Remove clauses 3 and 4 from makefs newfs_extern.hemaste2015-11-191-6/+1
| | | | Obtained from: NetBSD
* Bump .Ddngie2015-11-091-1/+1
|
* Follow up to r290259 dealing with makefs(8)ngie2015-11-091-3/+2
| | | | | | | | | | | - Don't use contractions (don't -> do not) - Change "throw away" to "discard" when describing the -o keep-bad-images option - Revert author e-mail split I brought over from NetBSD, effectively reverting the change bapt made in r267668 MFC after: 3 days Submitted by: bjk Sponsored by: EMC / Isilon Storage Division
* Add testcases for -t ffs -o version=[12]ngie2015-11-021-1/+66
| | | | | | | | Verify the filesystem type using dumpfs. Add preliminary support for NetBSD (needs to be validated) MFC after: 1 week Sponsored by: EMC / Isilon Storage Division
* Sync minor whitespace / type changes in ffs_csum_swap and ffs_sb_swap withngie2015-11-021-4/+4
| | | | | | | | src/sys/ufs/ffs/ffs_bswap.c@1.39 Obtained from: NetBSD MFC after: 1 week Sponsored by: EMC / Isilon Storage Division
* Clean up mtree keyword support a slight bit and add a few more default keywordsngie2015-11-023-3/+10
| | | | | | | | | - Parameterize the mtree keywords as $DEFAULT_MTREE_KEYWORDS - Test with the extra mtree keywords, `mode,gid,uid`. - Add a note about mtrees with time support not working with makefs right now MFC after: 1 week Sponsored by: EMC / Isilon Storage Division
* Add testcases for -t cd9660 -o isolevel=[1-3]ngie2015-11-021-0/+58
| | | | | | | | | | | | -- -o isolevel=1 currently fails because of path comparison issues, so mark it as an expected failure. -- -o isolevel=3 is not implemented, so expect it to fail as an out of bounds value [*]. PR: 203645 MFC after: 1 week X-MFC with: r290264 Sponsored by: EMC / Isilon Storage Division
* Limit isoLevel to 1 and 2 to avoid segfaulting when isoLevel is set to 3 byngie2015-11-021-2/+4
| | | | | | | | | | | dereferencing a NULL function pointer Add some asserts to ensure that isolevel is always either 1 or 2. PR: 203645 Reported by: Thomas Schmitt <scdbackup@gmx.net> MFC after: 1 week Sponsored by: EMC / Isilon Storage Division
* Fix spelling of `isolevel` cd9660 optionngie2015-11-021-1/+1
| | | | | | MFC after: 1 week X-MFC with: r290260 Sponsored by: EMC / Isilon Storage Division
* Bump .Dd for r290259 and r290260ngie2015-11-021-1/+1
|
* Document undocumented long options for -t cd9660ngie2015-11-021-6/+20
| | | | | | | | | | Note which options have been implemented and which options haven't been implemented Submitted as the following NetBSD PRs: bin/50390 and bin/50392 MFC after: 1 week Sponsored by: EMC / Isilon Storage Division
* Sync makefs(8) content a bit with src/usr.sbin/makefs/makefs.8@1.53ngie2015-11-021-18/+21
| | | | | | | | | Sections involving unimplemented filesystems (chfs, msdosfs, udf, v7fs) and options have been omitted. MFC after: 1 week Obtained from: NetBSD Sponsored by: EMC / Isilon Storage Division
* Follow up to roundup feature addition in r289203ngie2015-10-302-8/+13
| | | | | | | | | | | | | | | | - Rename -r to -R to avoid the clash with makefs -r in NetBSD - Note that -R is an FFS-specific option because it's not implemented in cd9660 today - Rename the roundup variable to "roundup-size" in the manpage and help text for consistency with other variables. - Bump .Dd (missed in r289203) PR: 203707 MFC after: 1 week X-MFC with: r289203 Differential Revision: https://reviews.freebsd.org/D3959 Reviewed by: adrian (earlier patch), emaste Sponsored by: EMC / Isilon Storage Division
* Add a regression test for r289899 to validate rockridge encodingngie2015-10-241-0/+27
| | | | | | | | of device types X-MFC with: r289899 MFC after: 2 weeks Sponsored by: EMC / Isilon Storage Division
* Remove an ls -l I was using for debuggingngie2015-10-241-1/+0
| | | | | | MFC after: 2 weeks X-MFC with: r289897 Sponsored by: EMC / Isilon Storage Division
* Import the fix from NetBSD kern/48852 (sic) to fix rockridge encoding ofngie2015-10-241-4/+5
| | | | | | | | | | | | | device nodes In particular, use st_rdev (the device type), not st_dev (the device inode), and fix the comparison to be correct with the st_rdev field Bug 203648 MFC after: 2 weeks Submitted by: Thomas Schmitt <scdbackup@gmx.net> Coverity CID: 1008927 Sponsored by: EMC / Isilon Storage Division
* Add more cd9660/FFS makefs testcasesngie2015-10-243-37/+429
| | | | | | | | | | | | | | | | | | | | | | | | | | | | General changes: - Parameterize out the mount command. - Use mtree to verify the contents of an image (check_image_contents) instead of using diff (diff verifies content, but not file metadata). - Move common logic out to functions (common_cleanup, mount_image, check_image_contents) - Add stub testcases for makefs -D (crashes with SIGBUS, similar to bug # 192839) - Add a note about the ISO-9660 and rockridge specs - Add testcases that exercise: -- Creating disk images from an mtree and multiple directories. -- -F flag use (not really an extensive testcase right now) cd9660-specific test changes: - Remove an XXX comment about symlinks; I forgot that non-rockridge images turn symlinks into hardlinks. - Add testcases that exercise: -- -o allow-deep-trees -- -o allow-max-name stub testcase (doesn't seem to be implemented in makefs) -- -o preparer (existence in image; not conformance to spec) -- -o publisher (existence in image; not conformance to spec) -- -o rockridge (basic) MFC after: 2 weeks Sponsored by: EMC / Isilon Storage Division
* Revise "create_test_inputs" to simplify the file structure asngie2015-10-223-23/+30
| | | | | | | | | | | | | | | | | | | | these testcases don't need to be nested as much as bin/ls/ls_tests.sh do when verifying ls -a, ls -A, etc. This allows the tests to make all paths relative to the top of the temporary directory instead of always tacking on $ATF_TMPDIR, thus complicating things unnecessarily Create non-empty files in create_test_inputs as well now, similar to create_test_inputs2 in bin/ls/ls_tests.sh Compare the input files to the output file contents using diff where possible: - Skip over the fifo comparison for now because it always fails - Skip over the symlink comparison on cd9660 because it always fails today Sponsored by: EMC / Isilon Storage Division MFC after: 2 weeks X-MFC with: r289739
* Correctly reintroduce the rudimentary smoke tests I botched upngie2015-10-225-0/+228
| | | | | | | in r289684 MFC after: 2 weeks Sponsored by: EMC / Isilon Storage Division
* Revert r289694ngie2015-10-218-248/+11
| | | | I committed some other undesirable local changes by accident
* Add some rudimentary [smoke] testcases for makefsngie2015-10-218-11/+248
| | | | | MFC after: 2 weeks Sponsored by: EMC / Isilon Storage Division
* Unbreak makefs -t cd9660 after r289687ngie2015-10-211-1/+1
| | | | | | | | | | | | | buffer_head needs to be freed -- not buffer Detected by jemalloc, i.e. running makefs failed the arena assert because my copy of malloc on CURRENT is compiled with the default !MALLOC_PRODUCTION asserts on Pointyhat to: ngie PR: 203647 X-MFC with: r289687 Sponsored by: EMC / Isilon Storage Division
* Free buffer before returning from cd9660_write_path_table to avoidngie2015-10-211-2/+4
| | | | | | | | | | leaking it after returning from the function MFC after: 1 week PR: 203647 Submitted by: Thomas Schmitt <scdbackup@gmx.net> Coverity CID: 978431 Sponsored by: EMC / Isilon Storage Division
* Fix a ton of speelling errorseadler2015-10-211-1/+1
| | | | | | | arc lint is helpful Reviewed By: allanjude, wblock, #manpages, chris@bsdjunk.com Differential Revision: https://reviews.freebsd.org/D3337
* Don't check if `val` is NULL before calling free; free(3) alreadyngie2015-10-191-2/+1
| | | | | | | | | | handles this MFC after: 1 week PR: 203649 Submitted by: Thomas Schmitt <scdbackup@gmx.net> Coverity CID: 1305659 Sponsored by: EMC / Isilon Storage Division
* makefs(8) leaves sblock.fs_providersize uninitialized (zero) that can be easilysbruno2015-10-131-1/+2
| | | | | | | | | | checked with dumpfs(8). This may lead to other problems, f.e. geom_label kernel module sanity checks do not like zero fs_old_size value and skips such UFS1 file system while tasting (fs_old_size derives from sblock.fs_providersize). PR: 203704 Submitted by: eugen@grosbein.net Reviewed by: marcel
* makefs: introduce a new option to specify what to round the resultingadrian2015-10-134-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | image up to. From ticket: While trying to run FreeBSD/mips on some device having very small flash media, one is forced to compress file system with mkulzma(8) utility. It is desirable to specify small UFS block/fragment sizes like 4096/512 bytes for makefs(8) and big compression block size like 65535 bytes to mkulzma at the same time. Then one obtains very good comression ratios (like 75% and more) but faces the following problem. geom_uncompress kernel module reports GEOM provider size rounded up to its compression block size. Generally, this changes original media size and now it fails to match the size of embedded UFS file system that leads to other problems, f.e. geom_label kernel module does not like this and skips the file system while tasting the GEOM and looking for UFS label. This makes it impossible to refer to the file system using known UFS label instead of something like /dev/map/rootfs.uncompress. The following patch introduces new command line option "-r roundup" for makefs that makes it round up the image to specified block size. Hence, geom_uncompress does not change GEOM media size for images rounded that way and geom_label accepts such GEOMs just fine. With the patch applied, one can use following commands: $ makefs -t ffs -r 65536 -o bsize=4096,fsize=512,label=flash optimization=space fs.img fs $ mkulzma -s 65536 -o fs.img.ulzma fs.img PR: bin/203707 Submitted by: <eugen@grosbein.net>
* Don't leak 'var'.delphij2015-09-031-1/+3
| | | | Reported by: clang static analyzer
* Add META_MODE support.sjg2015-06-131-0/+21
|\ | | | | | | | | | | | | | | | | | | | | Off by default, build behaves normally. WITH_META_MODE we get auto objdir creation, the ability to start build from anywhere in the tree. Still need to add real targets under targets/ to build packages. Differential Revision: D2796 Reviewed by: brooks imp
| * dirdeps.mk now sets DEP_RELDIRsjg2015-06-081-2/+0
| |
| * Merge sync of headsjg2015-05-272-8/+2
| |\ | |/ |/|
| * Merge from head@274682sjg2014-11-192-3/+2
| |\
| * \ Merge head from 7/28sjg2014-08-193-14/+11
| |\ \
| * | | Updated dependenciessjg2014-05-161-1/+0
| | | |
OpenPOWER on IntegriCloud