upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ensure that soft updates are not enabled by default when using mdmfs(8)

Browse source 
When soft updates began being enabled by default that change carried
over to mdmfs(8) which does not want or need them. This fix ensures
that they are only enabled in mdmfs(8) when requested with the -U flag.

Reported by: Ivan Rozhuk
Tested by:   Michael Proto
PR:          279308

(cherry picked from commit 5b21d4ad060acb06c72e0458daebec9bcbf0cefd)
This commit is contained in:
Kirk McKusick 2024-10-03 08:05:42 -07:00
parent 36c370fa3e
commit 54416c6e13
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/paths.h
View file

@ -92,6 +92,7 @@
#define _PATH_SENDMAIL "/usr/sbin/sendmail"
#define _PATH_SHELLS "/etc/shells"
#define _PATH_TTY "/dev/tty"
#define _PATH_TUNEFS "/sbin/tunefs"
#define _PATH_UNIX "don't use _PATH_UNIX"
#define _PATH_UFSSUSPEND "/dev/ufssuspend"
#define _PATH_VI "/usr/bin/vi"
@ -141,6 +142,8 @@ __END_DECLS
#define _PATH_REBOOT "/rescue/reboot"
#undef _PATH_RM
#define _PATH_RM "/rescue/rm"
#undef _PATH_TUNEFS
#define _PATH_TUNEFS "/rescue/tunefs"
#undef _PATH_VI
#define _PATH_VI "/rescue/vi"
#undef _PATH_WALL

9
sbin/mdmfs/mdmfs.c
View file

@ -105,7 +105,7 @@ main(int argc, char **argv)
bool detach, softdep, autounit, newfs;
const char *mtpoint, *size_arg, *skel, *unitstr;
char *p;
int ch, idx;
int ch, idx, rv;
void *set;
unsigned long ul;
@ -358,6 +358,13 @@ main(int argc, char **argv)
do_mdconfig_attach(mdconfig_arg, mdtype);
if (newfs)
do_newfs(newfs_arg);
if (!softdep) {
rv = run(NULL, "%s %s /dev/%s%d", _PATH_TUNEFS,
"-n disable", mdname, unit);
if (rv)
errx(1, "tunefs exited %s %d", run_exitstr(rv),
run_exitnumber(rv));
}
do_mount_md(mount_arg, mtpoint);
}