diskdev_cmds: Update to 667.100.2

diff --git a/diskdev_cmds/.apple_version b/diskdev_cmds/.apple_version
index fdc6407be2dfc831936596ca61b1626c9ecbc858..fddf545ac73b4910cee19e5380a10d112a0df197 100644 (file)
--- 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 ace7cbe1349fe73a68e450447c95319bd185606c..b5905a600573185cfe14b977db6822bae3d82d03 100644 (file)
--- 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 */