diff options
| author |   Cameron Katri <me@cameronkatri.com> | 2021-05-21 09:21:42 -0400 |
|---|---|---|
| committer | Cameron Katri <me@cameronkatri.com> | 2021-05-21 09:21:42 -0400 |
| commit | f06784df5a44c2aeb450ff88346a96f0bc9eb732 (patch) | |
| tree | 49e9923a65f7cf572a6f0833737b72848299b1c8 /diskdev_cmds | |
| parent | 0e3bb24ea8cde1573760b88ad56c1cc00be15cc8 (diff) | |
| parent | 8d788054a62508f8d1b93067be16fb73f987ca8e (diff) | |
| download | apple_cmds-f06784df5a44c2aeb450ff88346a96f0bc9eb732.tar.gz apple_cmds-f06784df5a44c2aeb450ff88346a96f0bc9eb732.tar.zst apple_cmds-f06784df5a44c2aeb450ff88346a96f0bc9eb732.zip | |
Merge branch 'apple'
Diffstat (limited to 'diskdev_cmds')
| -rw-r--r-- | diskdev_cmds/.apple_version | 2 | ||||
| -rw-r--r-- | diskdev_cmds/mount.tproj/mount.c | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/diskdev_cmds/.apple_version b/diskdev_cmds/.apple_version index fdc6407..fddf545 100644 --- a/diskdev_cmds/.apple_version +++ b/diskdev_cmds/.apple_version @@ -1 +1 @@ -667.40.1 +667.100.2 diff --git a/diskdev_cmds/mount.tproj/mount.c b/diskdev_cmds/mount.tproj/mount.c index ace7cbe..b5905a6 100644 --- a/diskdev_cmds/mount.tproj/mount.c +++ b/diskdev_cmds/mount.tproj/mount.c @@ -243,10 +243,7 @@ setup_preboot_mounts(int pass) const bind_mount_t preboot_mnts[] = { {.bm_mnt_prefix = PREBOOT_VOL_MOUNTPOINT, .bm_mnt_to = "/usr/standalone/firmware", - .bm_mandatory = true}, - {.bm_mnt_prefix = PREBOOT_VOL_MOUNTPOINT, - .bm_mnt_to = "/usr/local/standalone/firmware", - .bm_mandatory = false} + .bm_mandatory = true} }; const bind_mount_t hw_mnts[] = { @@ -463,7 +460,7 @@ main(argc, argv) continue; if (hasopt(fs->fs_mntops, "noauto")) continue; - if (!strcmp(fs->fs_vfstype, "nfs")) { + if (!strcmp(fs->fs_vfstype, "nfs") || !strcmp(fs->fs_vfstype, "url")) { if (hasopt(fs->fs_mntops, "net")) continue; /* check if already mounted */ |