diff options
| author |   deraadt <deraadt@openbsd.org> | 2020-07-22 05:06:38 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2020-07-22 05:06:38 +0000 |
| commit | d160f728ae5f899c35d73e4f17a772e21787adf0 (patch) | |
| tree | 3d7a252fdb730ad1dc9297c28e4082d50bb89e4e /usr.sbin/installboot | |
| parent | filter vlan and svlan packets by default. (diff) | |
| download | wireguard-openbsd-d160f728ae5f899c35d73e4f17a772e21787adf0.tar.xz wireguard-openbsd-d160f728ae5f899c35d73e4f17a772e21787adf0.zip | |
force long-names on msdos filenames, so that folk can see pretty names
later.
ok kettenis gkoehler
Diffstat (limited to 'usr.sbin/installboot')
| -rw-r--r-- | usr.sbin/installboot/armv7_installboot.c | 5 | ||||
| -rw-r--r-- | usr.sbin/installboot/i386_installboot.c | 3 | ||||
| -rw-r--r-- | usr.sbin/installboot/macppc_installboot.c | 3 | ||||
| -rw-r--r-- | usr.sbin/installboot/octeon_installboot.c | 3 |
4 files changed, 9 insertions, 5 deletions
diff --git a/usr.sbin/installboot/armv7_installboot.c b/usr.sbin/installboot/armv7_installboot.c index 809d4e67016..c4e5dd93b4a 100644 --- a/usr.sbin/installboot/armv7_installboot.c +++ b/usr.sbin/installboot/armv7_installboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: armv7_installboot.c,v 1.5 2020/06/27 15:35:29 deraadt Exp $ */ +/* $OpenBSD: armv7_installboot.c,v 1.6 2020/07/22 05:06:38 deraadt Exp $ */ /* $NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */ /* @@ -95,7 +95,7 @@ write_filesystem(struct disklabel *dl, char part) { static char *fsckfmt = "/sbin/fsck_msdos %s >/dev/null"; static char *newfsfmt ="/sbin/newfs_msdos %s >/dev/null"; - struct ufs_args args; + struct msdosfs_args args; char cmd[60]; char dst[PATH_MAX]; char *src; @@ -124,6 +124,7 @@ write_filesystem(struct disklabel *dl, char part) args.export_info.ex_root = -2; args.export_info.ex_flags = 0; + args.flags = MSDOSFSMNT_LONGNAME; if (mount(MOUNT_MSDOS, dst, 0, &args) == -1) { /* Try fsck'ing it. */ diff --git a/usr.sbin/installboot/i386_installboot.c b/usr.sbin/installboot/i386_installboot.c index 32ff6765e30..3153e0b53f0 100644 --- a/usr.sbin/installboot/i386_installboot.c +++ b/usr.sbin/installboot/i386_installboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i386_installboot.c,v 1.37 2020/06/27 15:35:29 deraadt Exp $ */ +/* $OpenBSD: i386_installboot.c,v 1.38 2020/07/22 05:06:38 deraadt Exp $ */ /* $NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */ /* @@ -255,6 +255,7 @@ write_filesystem(struct disklabel *dl, char part) args.export_info.ex_root = -2; /* unchecked anyway on DOS fs */ args.export_info.ex_flags = 0; + args.flags = MSDOSFSMNT_LONGNAME; if (mount(MOUNT_MSDOS, dst, 0, &args) == -1) { /* Try fsck'ing it. */ diff --git a/usr.sbin/installboot/macppc_installboot.c b/usr.sbin/installboot/macppc_installboot.c index c06014aedeb..3afb3b66a3d 100644 --- a/usr.sbin/installboot/macppc_installboot.c +++ b/usr.sbin/installboot/macppc_installboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: macppc_installboot.c,v 1.2 2020/07/18 16:42:00 deraadt Exp $ */ +/* $OpenBSD: macppc_installboot.c,v 1.3 2020/07/22 05:06:38 deraadt Exp $ */ /* * Copyright (c) 2011 Joel Sing <jsing@openbsd.org> @@ -124,6 +124,7 @@ write_filesystem(struct disklabel *dl, char part) args.export_info.ex_root = -2; args.export_info.ex_flags = 0; + args.flags = MSDOSFSMNT_LONGNAME; if (mount(MOUNT_MSDOS, dst, 0, &args) == -1) { /* Try fsck'ing it. */ diff --git a/usr.sbin/installboot/octeon_installboot.c b/usr.sbin/installboot/octeon_installboot.c index 1f52627764f..d9be070997d 100644 --- a/usr.sbin/installboot/octeon_installboot.c +++ b/usr.sbin/installboot/octeon_installboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: octeon_installboot.c,v 1.2 2020/07/18 16:42:00 deraadt Exp $ */ +/* $OpenBSD: octeon_installboot.c,v 1.3 2020/07/22 05:06:38 deraadt Exp $ */ /* * Copyright (c) 2011 Joel Sing <jsing@openbsd.org> @@ -124,6 +124,7 @@ write_filesystem(struct disklabel *dl, char part) args.export_info.ex_root = -2; args.export_info.ex_flags = 0; + args.flags = MSDOSFSMNT_LONGNAME; if (mount(MOUNT_MSDOS, dst, 0, &args) == -1) { /* Try fsck'ing it. */ |