Sync up my work for the night. This should implement ALL possible

installation methods and provide a fairly robust set of menu options.
This should also fix a few more bugs on Poul-Henning's latest gripe
list.

1 files changed, 92 insertions, 16 deletions

diff --git a/usr.sbin/sysinstall/nfs.c b/usr.sbin/sysinstall/nfs.c
index b9ab534..2ed22f6 100644
--- a/usr.sbin/sysinstall/nfs.c
+++ b/usr.sbin/sysinstall/nfs.c
@@ -1,21 +1,97 @@
+/*
+ * The new sysinstall program.
+ *
+ * This is probably the last attempt in the `sysinstall' line, the next
+ * generation being slated to essentially a complete rewrite.
+ *
+ * $Id: media.c,v 1.21 1995/05/28 03:04:58 jkh Exp $
+ *
+ * Copyright (c) 1995
+ *	Jordan Hubbard.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer, 
+ *    verbatim and that no modifications are made prior to this 
+ *    point in the file.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by Jordan Hubbard
+ *	for the FreeBSD Project.
+ * 4. The name of Jordan Hubbard or the FreeBSD project may not be used to
+ *    endorse or promote products derived from this software without specific
+ *    prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY JORDAN HUBBARD ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL JORDAN HUBBARD OR HIS PETS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, LIFE OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ */
+
 #include "sysinstall.h"
-#include <stdio.h>
-#include <ctype.h>
-#include <sys/stat.h>
 #include <sys/errno.h>
-#include <sys/file.h>
-#include <sys/types.h>
-#include <sys/wait.h>
+#include <sys/fcntl.h>
+#include <sys/syslimits.h>
 #include <sys/param.h>
-#include <sys/dkbad.h>
-#include <sys/mman.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include "ftp.h"
-
-#define NFS
 #include <sys/mount.h>
-#undef NFS
 
+Boolean NFSMounted;
+
+Boolean
+mediaInitNFS(Device *dev)
+{
+    if (NFSMounted)
+	return TRUE;
+
+    if (Mkdir("/nfs", NULL))
+	return FALSE;
+
+    if (!vsystem("mount_nfs %s %s %s /nfs", getenv("nfsSlowPC") ? "-r 1024 -w 1024" : "",
+	    getenv("nfsServerSecure") ? "-P" : "", dev->private))
+	return TRUE;
+    else {
+	msgConfirm("Error mounting %s on /nfs: %s (%u)\n", dev->private, strerror(errno), errno);
+	return FALSE;
+    }
+    NFSMounted = TRUE;
+    return TRUE;
+}
+
+int
+mediaGetNFS(char *file)
+{
+    char		buf[PATH_MAX];
+
+    snprintf(buf, PATH_MAX, "/nfs/%s", file);
+    if (!access(buf, R_OK))
+	    return open(buf, O_RDONLY);
+    snprintf(buf, PATH_MAX, "/nfs/dists/%s", file);
+    return open(buf, O_RDONLY);
+}
+
+void
+mediaShutdownNFS(Device *dev)
+{
+    if (!NFSMounted)
+	return;
+    msgDebug("Unmounting /nfs\n");
+    if (unmount("/nfs", 0) != 0)
+	msgConfirm("Could not unmount the NFS partition: %s\n", strerror(errno));
+    if (isDebug())
+	msgDebug("Unmount returned\n");
+    NFSMounted = FALSE;
+    return;
+}