usr.sbin/makefs/hammer2: Print chian/dio count on vflush()

in addition to inode count currently printed.

usr.sbin/makefs/hammer2: Use blkno -1 for logical vnode for clarity

At logical vnode layer, only bio_offset from uio_offset is used,
in the same way DragonFly VFS does. Since blkno should never be u

usr.sbin/makefs/hammer2: Use blkno -1 for logical vnode for clarity

At logical vnode layer, only bio_offset from uio_offset is used,
in the same way DragonFly VFS does. Since blkno should never be used,
set it to -1.

Then the bio_offset turns into bref's data_off through chain lookup.
At physical vnode layer, bref's data_off turns into a buf associated
with dio's devvp.

At this point dio's devvp buf needs a valid blkno (but not a valid
offset as getblk/bread/bwrite functions in ffs/buf.c are based on
FreeBSD VFS) to calculate file offset within image.

show more ...

usr.sbin/makefs/ffs: Remove m_buf::b_is_hammer2

FreeBSD makefs(8) now calls brelse() on bwrite(), whereas DragonFly
has had that behavior specifically for HAMMER2 to emulate VFS behavior.

m_buf::b_

usr.sbin/makefs/ffs: Remove m_buf::b_is_hammer2

FreeBSD makefs(8) now calls brelse() on bwrite(), whereas DragonFly
has had that behavior specifically for HAMMER2 to emulate VFS behavior.

m_buf::b_is_hammer2 flag which was introduced for this reason now
needs to be removed, otherwise it attempts to double free struct m_buf.

show more ...

usr.sbin/makefs/ffs: Sync buf.c with FreeBSD

Bring in following FreeBSD commits,
while keeping DragonFly specific code for HAMMER2.

Note that msdosfs_vnops.c diff in FreeBSD e5551216d8e5 was never

usr.sbin/makefs/ffs: Sync buf.c with FreeBSD

Bring in following FreeBSD commits,
while keeping DragonFly specific code for HAMMER2.

Note that msdosfs_vnops.c diff in FreeBSD e5551216d8e5 was never
merged to DragonFly makefs(8), so no need to apply (revert).

Sun Apr 16 15:45:17 2023 -0400 e5551216d8e5 makefs: call brelse from bread
Tue Apr 11 11:21:36 2023 -0400 af7624ed3145 makefs: use %s and __func__ in printf messages
Mon Apr 10 18:50:27 2023 -0400 1d1ffa2efd2a makefs: use size_t or ssize_t where appropriate

show more ...

usr.sbin/makefs/hammer2: Change fsinode::priv -> param

FreeBSD makefs(8) now has a void* pointer ->param for ZFS support
which points to fs specific data structure.

makefs HAMMER2 has had a void* p

usr.sbin/makefs/hammer2: Change fsinode::priv -> param

FreeBSD makefs(8) now has a void* pointer ->param for ZFS support
which points to fs specific data structure.

makefs HAMMER2 has had a void* pointer ->priv for the same purpose,
so rename it to ->param to sync with FreeBSD, though no intention
to bring in ZFS support.

show more ...

usr.sbin/makefs/hammer2: Avoid #include "makefs.h" in hammer2.h

Not a build error from ddd1d3d1ff2fecb3b58ce152a65095abaf634491,
but safer to avoid including "makefs.h" in usr.sbin/makefs/hammer2/ha

usr.sbin/makefs/hammer2: Avoid #include "makefs.h" in hammer2.h

Not a build error from ddd1d3d1ff2fecb3b58ce152a65095abaf634491,
but safer to avoid including "makefs.h" in usr.sbin/makefs/hammer2/hammer2.h
which basically shouldn't know anything about makefs(8).

show more ...

usr.sbin/makefs/hammer2: Include <stdbool.h> for hammer2_update_time()

A bool argument from ddd1d3d1ff2fecb3b58ce152a65095abaf634491 needs <stdbool.h>.
It fails to compile on some platforms.

usr.sbin/makefs/hammer2: Derive timestamp from source inodes

makefs(8) HAMMER2 has been using current time for inode's ctime/mtime.
Change hammer2_update_time() to use current fsnode's timestamp.
Al

usr.sbin/makefs/hammer2: Derive timestamp from source inodes

makefs(8) HAMMER2 has been using current time for inode's ctime/mtime.
Change hammer2_update_time() to use current fsnode's timestamp.
Also support -T option.

Note that both hammer2_curnode (current fsnode) and stampst (-T option)
are global variables.

show more ...

usr.sbin/makefs: Sync with sys/vfs/hammer2

Sync with following sys/vfs/hammer2 commits.

$ git log --pretty="%h %s" e49cd5358c56593a7923a00706d26dbc4e8bdaed.. -- sys/vfs/hammer2/
d6f11ef8ed sys/vfs/

usr.sbin/makefs: Sync with sys/vfs/hammer2

Sync with following sys/vfs/hammer2 commits.

$ git log --pretty="%h %s" e49cd5358c56593a7923a00706d26dbc4e8bdaed.. -- sys/vfs/hammer2/
d6f11ef8ed sys/vfs/hammer2: Remove unneeded (char *)bp->b_data cast
0a7ab00601 sys/vfs/hammer2: Comment out unused local variables
8fd12ec463 sys/vfs/hammer2: Remove KKASSERT expecting path to start with "/dev/"
2e3d3c15cd sys/vfs/hammer2: Use HAMMER2_ROOT_VOLUME instead of 0
9be1b0c77a Revert "sys/vfs/hammer2: Avoid void* pointer arithmetic"

show more ...

usr.sbin/makefs: Remove unused local variable

Warned on FreeBSD.

--
warning: variable 'tot' set but not used [-Wunused-but-set-variable]
size_t tot = 0;
^

cpucontrol.8: Fix markup error in SYNOPSIS

Obtained-from: FreeBSD

Fix installer build.

installer(8): Remove passphrase tmp file after use

installer(8): Distinguish setting and getting of encryption passphrase

The installer was using the *same* dialog to set and get the passphrase
for filesystem encryption/decryption, which was confusi

installer(8): Distinguish setting and getting of encryption passphrase

The installer was using the *same* dialog to set and get the passphrase
for filesystem encryption/decryption, which was confusing and a bit
inconvenience (because the passphrase was required to input twice for
decryption).

The decryption passphrase was get in the following two places:
1. Just after installation and begins to configure the system, the
passphrase is asked to decrypt and mount the filesystems;
2. Use the LiveCD to "Configure an installed System".

This commit improves the fn_get_passphrase() function to distinguish the
setting and getting of the encryption passphrase. The dialog of setting
the passphrase remains the same, but the dialog of getting the
passphrase is simplified and doesn't require to confirm the input.

This commit is derived from the patch by tuxillo.

Bug: https://bugs.dragonflybsd.org/issues/3028

show more ...

pw(8): Allow to change GID of non-root super users (UID=0)

pw(8) was silently refusing to change the GID/group of super users (i.e.,
UID=0), and thus couldn't change the group of 'toor' user.

Relax

pw(8): Allow to change GID of non-root super users (UID=0)

pw(8) was silently refusing to change the GID/group of super users (i.e.,
UID=0), and thus couldn't change the group of 'toor' user.

Relax the policy a bit and only preventing from changing the GID/group
of 'root' user, and raise an error in that case. The 'root' is regarded
as the special super user and already has several special checks in the
code. So this change actually make the behavior more consistent.

This commit fixes the special case of 'tools/pw-update.sh' adding the
'toor' user. It first adds the user with group of 'nogroup' and later
change to its real group.

Bug: https://bugs.dragonflybsd.org/issues/3332

show more ...

usr.sbin/makefs: Fix HAMMER2 section in makefs(8)

Copied from cd9660 section, but none of these are optional.

usr.sbin/makefs: Print too long path in errx()

usr.sbin/makefs: Set HAMMER2 inode mode using source inode

which is also what other makefs fs do.

usr.sbin/makefs: Sync with sys/vfs/hammer2

Sync with following sys/vfs/hammer2 commits.

$ git log --pretty="%h %s" 66f2c621b4a3c452381030521ca3bb6dadfba431.. -- sys/vfs/hammer2/
1d5238a4ed sys/vfs/

usr.sbin/makefs: Sync with sys/vfs/hammer2

Sync with following sys/vfs/hammer2 commits.

$ git log --pretty="%h %s" 66f2c621b4a3c452381030521ca3bb6dadfba431.. -- sys/vfs/hammer2/
1d5238a4ed sys/vfs/hammer2: Fix -Wpointer-sign warnings on hammer2_dirhash()
1b796c7004 sys/vfs/hammer2: Fix -Wpointer-sign warnings

show more ...

usr.sbin/makefs: Fix -Wformat warnings

Warned on Linux user space.
makefs(8) HAMMER2 specific part of what was fixed in 4ed61d288d.

warning: format '%jx' expects argument of type 'uintmax_t', but .

usr.sbin/makefs: Fix -Wformat warnings

Warned on Linux user space.
makefs(8) HAMMER2 specific part of what was fixed in 4ed61d288d.

warning: format '%jx' expects argument of type 'uintmax_t', but ... [-Wformat=]

show more ...

usr.sbin/makefs: Sync with sys/vfs/hammer2

Sync with following sys/vfs/hammer2 commits.

$ git log --pretty="%h %s" 347169d4ac18a2d8b3a5e7ac93ccd9823cdac4c9.. -- sys/vfs/hammer2/
4ed61d288d sys/vfs/

usr.sbin/makefs: Sync with sys/vfs/hammer2

Sync with following sys/vfs/hammer2 commits.

$ git log --pretty="%h %s" 347169d4ac18a2d8b3a5e7ac93ccd9823cdac4c9.. -- sys/vfs/hammer2/
4ed61d288d sys/vfs/hammer2: Fix -Wformat warnings
f6ce9317ec sys/vfs/hammer2: Fix -Wint-in-bool-context warning
523dfb54e3 sys/vfs/hammer2: Remove -Wunused-but-set-variable local variables

show more ...

usr.sbin/makefs: Remove -Wunused-but-set-variable local variable

Warned on Linux user space.

usr.sbin/makefs: Use `char *` not `void *` for buf b_data

, drop casts in msdos

Only struct m_buf change applies in this commit.
"drop casts in msdos" part had already been applied.

taken-from Fre

usr.sbin/makefs: Use `char *` not `void *` for buf b_data

, drop casts in msdos

Only struct m_buf change applies in this commit.
"drop casts in msdos" part had already been applied.

taken-from FreeBSD ef63362055dcf60ea2eb532991584c67aab911e2

show more ...

usr.sbin/makefs: Rename struct buf -> m_buf

to reduce unnecessary diff vs FreeBSD makefs.

usr.sbin/makefs: Rename struct vnode -> m_vnode

to reduce unnecessary diff vs FreeBSD makefs.