Make all this work under -current again.
Submitted-By: Chuck Robey <chuckr@glue.umd.edu>
This commit is contained in:
Jordan K. Hubbard
parent
28fb62d30e
commit
66b368e835
@ -4,7 +4,7 @@
|
||||
* This is probably the last attempt in the `sysinstall' line, the next
|
||||
* generation being slated to essentially a complete rewrite.
|
||||
*
|
||||
* $Id$
|
||||
* $Id: cdrom.c,v 1.38 1997/02/22 14:11:12 peter Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -49,6 +49,7 @@
|
||||
|
||||
#define CD9660
|
||||
#include <sys/mount.h>
|
||||
#include <isofs/cd9660/cd9660_mount.h>
|
||||
#undef CD9660
|
||||
|
||||
static Boolean cdromMounted;
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
* This is probably the last attempt in the `sysinstall' line, the next
|
||||
* generation being slated to essentially a complete rewrite.
|
||||
*
|
||||
* $Id: floppy.c,v 1.23 1997/02/22 14:11:40 peter Exp $
|
||||
* $Id: floppy.c,v 1.24 1997/03/19 10:09:16 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -49,8 +49,10 @@
|
||||
|
||||
#define MSDOSFS
|
||||
#include <sys/mount.h>
|
||||
#include <msdosfs/msdosfsmount.h>
|
||||
#undef MSDOSFS
|
||||
|
||||
#include <ufs/ufs/ufsmount.h>
|
||||
static Device *floppyDev;
|
||||
static Boolean floppyMounted;
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
* This is probably the last program in the `sysinstall' line - the next
|
||||
* generation being essentially a complete rewrite.
|
||||
*
|
||||
* $Id: install.c,v 1.134.2.40 1997/03/28 02:25:14 jkh Exp $
|
||||
* $Id: install.c,v 1.180 1997/04/02 12:07:32 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -45,6 +45,8 @@
|
||||
#include <sys/param.h>
|
||||
#define MSDOSFS
|
||||
#include <sys/mount.h>
|
||||
#include <ufs/ufs/ufsmount.h>
|
||||
#include <msdosfs/msdosfsmount.h>
|
||||
#undef MSDOSFS
|
||||
#include <sys/stat.h>
|
||||
#include <unistd.h>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/*
|
||||
* Miscellaneous support routines..
|
||||
*
|
||||
* $Id: misc.c,v 1.32 1997/02/22 14:12:08 peter Exp $
|
||||
* $Id: misc.c,v 1.33 1997/03/09 22:25:47 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -42,6 +42,7 @@
|
||||
#include <sys/wait.h>
|
||||
#include <sys/param.h>
|
||||
#include <sys/mount.h>
|
||||
#include <ufs/ufs/ufsmount.h>
|
||||
#include <sys/reboot.h>
|
||||
#include <sys/dkbad.h>
|
||||
#include <sys/disklabel.h>
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
* This is probably the last program in the `sysinstall' line - the next
|
||||
* generation being essentially a complete rewrite.
|
||||
*
|
||||
* $Id: install.c,v 1.134.2.40 1997/03/28 02:25:14 jkh Exp $
|
||||
* $Id: install.c,v 1.180 1997/04/02 12:07:32 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -45,6 +45,8 @@
|
||||
#include <sys/param.h>
|
||||
#define MSDOSFS
|
||||
#include <sys/mount.h>
|
||||
#include <ufs/ufs/ufsmount.h>
|
||||
#include <msdosfs/msdosfsmount.h>
|
||||
#undef MSDOSFS
|
||||
#include <sys/stat.h>
|
||||
#include <unistd.h>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/*
|
||||
* Miscellaneous support routines..
|
||||
*
|
||||
* $Id: misc.c,v 1.32 1997/02/22 14:12:08 peter Exp $
|
||||
* $Id: misc.c,v 1.33 1997/03/09 22:25:47 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -42,6 +42,7 @@
|
||||
#include <sys/wait.h>
|
||||
#include <sys/param.h>
|
||||
#include <sys/mount.h>
|
||||
#include <ufs/ufs/ufsmount.h>
|
||||
#include <sys/reboot.h>
|
||||
#include <sys/dkbad.h>
|
||||
#include <sys/disklabel.h>
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
* This is probably the last attempt in the `sysinstall' line, the next
|
||||
* generation being slated to essentially a complete rewrite.
|
||||
*
|
||||
* $Id$
|
||||
* $Id: cdrom.c,v 1.38 1997/02/22 14:11:12 peter Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -49,6 +49,7 @@
|
||||
|
||||
#define CD9660
|
||||
#include <sys/mount.h>
|
||||
#include <isofs/cd9660/cd9660_mount.h>
|
||||
#undef CD9660
|
||||
|
||||
static Boolean cdromMounted;
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
* This is probably the last attempt in the `sysinstall' line, the next
|
||||
* generation being slated to essentially a complete rewrite.
|
||||
*
|
||||
* $Id: floppy.c,v 1.23 1997/02/22 14:11:40 peter Exp $
|
||||
* $Id: floppy.c,v 1.24 1997/03/19 10:09:16 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -49,8 +49,10 @@
|
||||
|
||||
#define MSDOSFS
|
||||
#include <sys/mount.h>
|
||||
#include <msdosfs/msdosfsmount.h>
|
||||
#undef MSDOSFS
|
||||
|
||||
#include <ufs/ufs/ufsmount.h>
|
||||
static Device *floppyDev;
|
||||
static Boolean floppyMounted;
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
* This is probably the last program in the `sysinstall' line - the next
|
||||
* generation being essentially a complete rewrite.
|
||||
*
|
||||
* $Id: install.c,v 1.134.2.40 1997/03/28 02:25:14 jkh Exp $
|
||||
* $Id: install.c,v 1.180 1997/04/02 12:07:32 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -45,6 +45,8 @@
|
||||
#include <sys/param.h>
|
||||
#define MSDOSFS
|
||||
#include <sys/mount.h>
|
||||
#include <ufs/ufs/ufsmount.h>
|
||||
#include <msdosfs/msdosfsmount.h>
|
||||
#undef MSDOSFS
|
||||
#include <sys/stat.h>
|
||||
#include <unistd.h>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/*
|
||||
* Miscellaneous support routines..
|
||||
*
|
||||
* $Id: misc.c,v 1.32 1997/02/22 14:12:08 peter Exp $
|
||||
* $Id: misc.c,v 1.33 1997/03/09 22:25:47 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -42,6 +42,7 @@
|
||||
#include <sys/wait.h>
|
||||
#include <sys/param.h>
|
||||
#include <sys/mount.h>
|
||||
#include <ufs/ufs/ufsmount.h>
|
||||
#include <sys/reboot.h>
|
||||
#include <sys/dkbad.h>
|
||||
#include <sys/disklabel.h>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user