Fix something I broke with CDROM installation (well, I knew my first

test CD would turn at least one bug up :-).

1 files changed, 8 insertions, 8 deletions

diff --git a/usr.sbin/sade/main.c b/usr.sbin/sade/main.c
index 8c20589..647efd3 100644
--- a/usr.sbin/sade/main.c
+++ b/usr.sbin/sade/main.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated for what's essentially a complete rewrite.
  *
- * $Id: main.c,v 1.22 1996/06/26 09:09:28 jkh Exp $
+ * $Id: main.c,v 1.23 1996/07/02 01:03:44 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -86,17 +86,17 @@ main(int argc, char **argv)
     /* Probe for all relevant devices on the system */
     deviceGetAll();
 
-    /* Try to set ourselves up as a CDROM if we can do that first */
-    if (DITEM_STATUS(mediaSetCDROM(NULL)) == DITEM_SUCCESS) {
-	/* If we can't initialize it, it's probably not a FreeBSD CDROM so punt on it */
-	if (!mediaDevice->init(mediaDevice))
-	    mediaDevice = NULL;
-    }
-
     /* First, see if we have any arguments to process (and argv[0] counts if it's not "sysinstall") */
     if (!RunningAsInit) {
 	int i, start_arg;
 
+	/* Try to set ourselves up as a CDROM if we can do that first */
+	if (DITEM_STATUS(mediaSetCDROM(NULL)) == DITEM_SUCCESS) {
+	    /* If we can't initialize it, it's probably not a FreeBSD CDROM so punt on it */
+	    if (!mediaDevice->init(mediaDevice))
+		mediaDevice = NULL;
+	}
+
 	if (!strstr(argv[0], "sysinstall"))
 	    start_arg = 0;
 	else