diff options
| author | phk <phk@FreeBSD.org> | 2002-10-21 21:41:19 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2002-10-21 21:41:19 +0000 |
| commit | 0aaa630c217f8035d47fff59b181d9f5a6965751 (patch) | |
| tree | 2873e977b2d787fa10fb031e9236ede9d44d7998 /usr.sbin | |
| parent | 87d8bcb4cec1d7592062e19a03884b7ccd18ce1c (diff) | |
| download | FreeBSD-src-0aaa630c217f8035d47fff59b181d9f5a6965751.zip FreeBSD-src-0aaa630c217f8035d47fff59b181d9f5a6965751.tar.gz | |
DEVFS has been nmountified, so use nmount(2) to mount it.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/sade/install.c | 16 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/install.c | 16 |
2 files changed, 28 insertions, 4 deletions
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c index 8cfc955..3756905 100644 --- a/usr.sbin/sade/install.c +++ b/usr.sbin/sade/install.c @@ -41,6 +41,7 @@ #include <sys/ioctl.h> #include <sys/fcntl.h> #include <sys/wait.h> +#include <sys/uio.h> #include <sys/param.h> #define MSDOSFS #include <sys/mount.h> @@ -1008,8 +1009,19 @@ installFilesystems(dialogMenuItem *self) /* Mount devfs for other partitions to mount */ Mkdir("/mnt/dev"); - if (!Fake) - mountfailed = mount("devfs", "/mnt/dev", 0, NULL); + if (!Fake) { + struct iovec iov[4]; + + iov[0].iov_base = "fstype"; + iov[0].iov_len = strlen(iov[0].iov_base) + 1; + iov[1].iov_base = "devfs"; + iov[1].iov_len = strlen(iov[1].iov_base) + 1; + iov[2].iov_base = "fspath"; + iov[1].iov_len = strlen(iov[2].iov_base) + 1; + iov[3].iov_base = "/mnt/dev"; + iov[1].iov_len = strlen(iov[3].iov_base) + 1; + mountfailed = nmount(iov, 4, 0); + } if (mountfailed) { dialog_clear_norefresh(); diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c index 8cfc955..3756905 100644 --- a/usr.sbin/sysinstall/install.c +++ b/usr.sbin/sysinstall/install.c @@ -41,6 +41,7 @@ #include <sys/ioctl.h> #include <sys/fcntl.h> #include <sys/wait.h> +#include <sys/uio.h> #include <sys/param.h> #define MSDOSFS #include <sys/mount.h> @@ -1008,8 +1009,19 @@ installFilesystems(dialogMenuItem *self) /* Mount devfs for other partitions to mount */ Mkdir("/mnt/dev"); - if (!Fake) - mountfailed = mount("devfs", "/mnt/dev", 0, NULL); + if (!Fake) { + struct iovec iov[4]; + + iov[0].iov_base = "fstype"; + iov[0].iov_len = strlen(iov[0].iov_base) + 1; + iov[1].iov_base = "devfs"; + iov[1].iov_len = strlen(iov[1].iov_base) + 1; + iov[2].iov_base = "fspath"; + iov[1].iov_len = strlen(iov[2].iov_base) + 1; + iov[3].iov_base = "/mnt/dev"; + iov[1].iov_len = strlen(iov[3].iov_base) + 1; + mountfailed = nmount(iov, 4, 0); + } if (mountfailed) { dialog_clear_norefresh(); |
