svn commit: r186202 - head/usr.sbin/sysinstall
Ken Smith
kensmith at FreeBSD.org
Wed Dec 17 02:52:46 UTC 2008
Author: kensmith
Date: Wed Dec 17 02:52:45 2008
New Revision: 186202
URL: http://svn.freebsd.org/changeset/base/186202
Log:
As threatened a while ago, remove support for tape media. Reports vary
but most people believe it stopped working a while ago.
Modified:
head/usr.sbin/sysinstall/Makefile
head/usr.sbin/sysinstall/devices.c
head/usr.sbin/sysinstall/dispatch.c
head/usr.sbin/sysinstall/media.c
head/usr.sbin/sysinstall/menus.c
head/usr.sbin/sysinstall/options.c
head/usr.sbin/sysinstall/sysinstall.8
head/usr.sbin/sysinstall/sysinstall.h
Modified: head/usr.sbin/sysinstall/Makefile
==============================================================================
--- head/usr.sbin/sysinstall/Makefile Wed Dec 17 00:53:59 2008 (r186201)
+++ head/usr.sbin/sysinstall/Makefile Wed Dec 17 02:52:45 2008 (r186202)
@@ -11,7 +11,7 @@ SRCS= anonFTP.c cdrom.c command.c config
ftp.c globals.c http.c index.c install.c installUpgrade.c keymap.c \
label.c main.c makedevs.c media.c menus.c misc.c modules.c \
mouse.c msg.c network.c nfs.c options.c package.c \
- system.c tape.c tcpip.c termcap.c ttys.c ufs.c user.c \
+ system.c tcpip.c termcap.c ttys.c ufs.c user.c \
variable.c ${_wizard} keymap.h countries.h
CFLAGS+= -DUSE_GZIP=1
Modified: head/usr.sbin/sysinstall/devices.c
==============================================================================
--- head/usr.sbin/sysinstall/devices.c Wed Dec 17 00:53:59 2008 (r186201)
+++ head/usr.sbin/sysinstall/devices.c Wed Dec 17 02:52:45 2008 (r186202)
@@ -57,8 +57,6 @@ static int numDevs;
#define CDROM(name, descr, max) \
DEVICE_ENTRY(DEVICE_TYPE_CDROM, name, descr, max)
-#define TAPE(name, descr, max) \
- DEVICE_ENTRY(DEVICE_TYPE_TAPE, name, descr, max)
#define DISK(name, descr, max) \
DEVICE_ENTRY(DEVICE_TYPE_DISK, name, descr, max)
#define FLOPPY(name, descr, max) \
@@ -78,8 +76,6 @@ static struct _devname {
CDROM("mcd%d", "Mitsumi (old model) CDROM drive", 4),
CDROM("scd%d", "Sony CDROM drive - CDU31/33A type", 4),
CDROM("acd%d", "ATAPI/IDE CDROM", 4),
- TAPE("sa%d", "SCSI tape drive", 4),
- TAPE("rwt%d", "Wangtek tape drive", 4),
DISK("da%d", "SCSI disk device", 16),
DISK("ad%d", "ATA/IDE disk device", 16),
DISK("ar%d", "ATA/IDE RAID device", 16),
@@ -367,20 +363,6 @@ skipif:
}
break;
- case DEVICE_TYPE_TAPE:
- fd = deviceTry(device_names[i], try, j);
- if (fd >= 0) {
- char n[BUFSIZ];
-
- close(fd);
- snprintf(n, sizeof n, device_names[i].name, j);
- deviceRegister(strdup(n), device_names[i].description, strdup(try),
- DEVICE_TYPE_TAPE, TRUE, mediaInitTape, mediaGetTape, mediaShutdownTape, NULL);
- if (isDebug())
- msgDebug("Found a TAPE device for %s\n", try);
- }
- break;
-
case DEVICE_TYPE_DISK:
/* nothing to do */
break;
Modified: head/usr.sbin/sysinstall/dispatch.c
==============================================================================
--- head/usr.sbin/sysinstall/dispatch.c Wed Dec 17 00:53:59 2008 (r186201)
+++ head/usr.sbin/sysinstall/dispatch.c Wed Dec 17 02:52:45 2008 (r186202)
@@ -95,7 +95,6 @@ static struct _word {
{ "mediaSetCDROM", mediaSetCDROM },
{ "mediaSetFloppy", mediaSetFloppy },
{ "mediaSetDOS", mediaSetDOS },
- { "mediaSetTape", mediaSetTape },
{ "mediaSetFTP", mediaSetFTP },
{ "mediaSetFTPActive", mediaSetFTPActive },
{ "mediaSetFTPPassive", mediaSetFTPPassive },
Modified: head/usr.sbin/sysinstall/media.c
==============================================================================
--- head/usr.sbin/sysinstall/media.c Wed Dec 17 00:53:59 2008 (r186201)
+++ head/usr.sbin/sysinstall/media.c Wed Dec 17 02:52:45 2008 (r186202)
@@ -260,61 +260,6 @@ mediaSetDOS(dialogMenuItem *self)
return (mediaDevice ? DITEM_LEAVE_MENU : DITEM_FAILURE);
}
-static int
-tapeHook(dialogMenuItem *self)
-{
- return genericHook(self, DEVICE_TYPE_TAPE);
-}
-
-/*
- * Return 1 if we successfully found and set the installation type to
- * be a tape drive.
- */
-int
-mediaSetTape(dialogMenuItem *self)
-{
- Device **devs;
- int cnt;
-
- mediaClose();
- devs = deviceFind(NULL, DEVICE_TYPE_TAPE);
- cnt = deviceCount(devs);
- if (!cnt) {
- msgConfirm("No tape drive devices found! Please check that your system's configuration\n"
- "is correct. For more information, consult the hardware guide in the Doc\n"
- "menu.");
- return DITEM_FAILURE | DITEM_CONTINUE;
- }
- else if (cnt > 1) {
- DMenu *menu;
- int status;
-
- menu = deviceCreateMenu(&MenuMediaTape, DEVICE_TYPE_TAPE, tapeHook, NULL);
- if (!menu)
- msgFatal("Unable to create tape drive menu! Something is seriously wrong.");
- status = dmenuOpenSimple(menu, FALSE);
- free(menu);
- if (!status)
- return DITEM_FAILURE;
- }
- else
- mediaDevice = devs[0];
- if (mediaDevice) {
- char *val;
-
- val = msgGetInput("/var/tmp", "Please enter the name of a temporary directory containing\n"
- "sufficient space for holding the contents of this tape (or\n"
- "tapes). The contents of this directory will be removed\n"
- "after installation, so be sure to specify a directory that\n"
- "can be erased afterwards!\n");
- if (!val)
- mediaDevice = NULL;
- else
- mediaDevice->private = strdup(val);
- }
- return (mediaDevice ? DITEM_LEAVE_MENU : DITEM_FAILURE);
-}
-
/*
* Return 0 if we successfully found and set the installation type to
* be an ftp server
Modified: head/usr.sbin/sysinstall/menus.c
==============================================================================
--- head/usr.sbin/sysinstall/menus.c Wed Dec 17 00:53:59 2008 (r186201)
+++ head/usr.sbin/sysinstall/menus.c Wed Dec 17 02:52:45 2008 (r186202)
@@ -186,7 +186,6 @@ DMenu MenuIndex = {
{ " Install, Custom", "The custom installation menu", NULL, dmenuSubmenu, NULL, &MenuInstallCustom },
{ " Label", "The disk Label editor", NULL, diskLabelEditor },
{ " Media", "Top level media selection menu.", NULL, dmenuSubmenu, NULL, &MenuMedia },
- { " Media, Tape", "Select tape installation media.", NULL, mediaSetTape },
{ " Media, NFS", "Select NFS installation media.", NULL, mediaSetNFS },
{ " Media, Floppy", "Select floppy installation media.", NULL, mediaSetFloppy },
{ " Media, CDROM/DVD", "Select CDROM/DVD installation media.", NULL, mediaSetCDROM },
@@ -794,20 +793,6 @@ DMenu MenuMediaFTP = {
{ NULL } }
};
-DMenu MenuMediaTape = {
- DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
- "Choose a tape drive type",
- "FreeBSD can be installed from tape drive, though this installation\n"
- "method requires a certain amount of temporary storage in addition\n"
- "to the space required by the distribution itself (tape drives make\n"
- "poor random-access devices, so we extract _everything_ on the tape\n"
- "in one pass). If you have sufficient space for this, then you should\n"
- "select one of the following tape devices detected on your system.",
- NULL,
- NULL,
- { { NULL } },
-};
-
DMenu MenuNetworkDevice = {
DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
"Network interface information required",
@@ -852,7 +837,6 @@ DMenu MenuMedia = {
{ "6 NFS", "Install over NFS", NULL, mediaSetNFS },
{ "7 File System", "Install from an existing filesystem", NULL, mediaSetUFS },
{ "8 Floppy", "Install from a floppy disk set", NULL, mediaSetFloppy },
- { "9 Tape", "Install from SCSI or QIC tape", NULL, mediaSetTape },
{ "X Options", "Go to the Options screen", NULL, optionsEditor },
{ NULL } },
};
Modified: head/usr.sbin/sysinstall/options.c
==============================================================================
--- head/usr.sbin/sysinstall/options.c Wed Dec 17 00:53:59 2008 (r186201)
+++ head/usr.sbin/sysinstall/options.c Wed Dec 17 02:52:45 2008 (r186202)
@@ -78,9 +78,6 @@ mediaCheck(Option *opt)
case DEVICE_TYPE_CDROM:
return "CDROM";
- case DEVICE_TYPE_TAPE:
- return "Tape";
-
case DEVICE_TYPE_DOS:
return "DOS";
Modified: head/usr.sbin/sysinstall/sysinstall.8
==============================================================================
--- head/usr.sbin/sysinstall/sysinstall.8 Wed Dec 17 00:53:59 2008 (r186201)
+++ head/usr.sbin/sysinstall/sysinstall.8 Wed Dec 17 02:52:45 2008 (r186202)
@@ -615,11 +615,6 @@ The first primary partition found is use
.Pp
.Sy Variables :
None
-.It mediaSetTape
-Select a tape device as the installation media.
-.Pp
-.Sy Variables :
-None
.It mediaSetFTP
Select an FTP site as the installation media.
.Pp
Modified: head/usr.sbin/sysinstall/sysinstall.h
==============================================================================
--- head/usr.sbin/sysinstall/sysinstall.h Wed Dec 17 00:53:59 2008 (r186201)
+++ head/usr.sbin/sysinstall/sysinstall.h Wed Dec 17 02:52:45 2008 (r186202)
@@ -271,7 +271,6 @@ typedef enum {
DEVICE_TYPE_FTP,
DEVICE_TYPE_NETWORK,
DEVICE_TYPE_CDROM,
- DEVICE_TYPE_TAPE,
DEVICE_TYPE_DOS,
DEVICE_TYPE_UFS,
DEVICE_TYPE_NFS,
@@ -443,7 +442,6 @@ extern DMenu MenuMediaCDROM; /* CDROM
extern DMenu MenuMediaDOS; /* DOS media menu */
extern DMenu MenuMediaFloppy; /* Floppy media menu */
extern DMenu MenuMediaFTP; /* FTP media menu */
-extern DMenu MenuMediaTape; /* Tape media menu */
extern DMenu MenuNetworkDevice; /* Network device menu */
extern DMenu MenuNTP; /* NTP time server menu */
extern DMenu MenuSecurity; /* System security options menu */
@@ -717,7 +715,6 @@ extern int mediaTimeout(void);
extern int mediaSetCDROM(dialogMenuItem *self);
extern int mediaSetFloppy(dialogMenuItem *self);
extern int mediaSetDOS(dialogMenuItem *self);
-extern int mediaSetTape(dialogMenuItem *self);
extern int mediaSetFTP(dialogMenuItem *self);
extern int mediaSetFTPActive(dialogMenuItem *self);
extern int mediaSetFTPPassive(dialogMenuItem *self);
@@ -835,11 +832,6 @@ extern void systemChangeScreenmap(const
extern void systemCreateHoloshell(void);
extern int vsystem(char *fmt, ...) __printflike(1, 2);
-/* tape.c */
-extern Boolean mediaInitTape(Device *dev);
-extern FILE *mediaGetTape(Device *dev, char *file, Boolean probe);
-extern void mediaShutdownTape(Device *dev);
-
/* tcpip.c */
extern int tcpOpenDialog(Device *dev);
extern int tcpMenuSelect(dialogMenuItem *self);
More information about the svn-src-head
mailing list