diff options
author | iedowse <iedowse@FreeBSD.org> | 2005-12-15 01:04:51 +0000 |
---|---|---|
committer | iedowse <iedowse@FreeBSD.org> | 2005-12-15 01:04:51 +0000 |
commit | 0b71e714c9e7239d129409bbab17fcae134c16a4 (patch) | |
tree | 7737c1a04045bcabcabbb04e4e56f6cf312b9a67 /usr.sbin/sysinstall | |
parent | a7aeead21d6a4abfb93a5304f78212bd5ee19274 (diff) | |
download | FreeBSD-src-0b71e714c9e7239d129409bbab17fcae134c16a4.zip FreeBSD-src-0b71e714c9e7239d129409bbab17fcae134c16a4.tar.gz |
Remove usbd(8) and all references to it. It is no longer necessary
since devd(8) now provides the same functionality.
Submitted by: Anish Mistry
Diffstat (limited to 'usr.sbin/sysinstall')
-rw-r--r-- | usr.sbin/sysinstall/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/sysinstall/main.c | 6 | ||||
-rw-r--r-- | usr.sbin/sysinstall/menus.c | 4 | ||||
-rw-r--r-- | usr.sbin/sysinstall/sysinstall.h | 3 | ||||
-rw-r--r-- | usr.sbin/sysinstall/usb.c | 44 |
5 files changed, 1 insertions, 58 deletions
diff --git a/usr.sbin/sysinstall/Makefile b/usr.sbin/sysinstall/Makefile index cb18093..77d8518 100644 --- a/usr.sbin/sysinstall/Makefile +++ b/usr.sbin/sysinstall/Makefile @@ -11,7 +11,7 @@ SRCS= anonFTP.c cdrom.c command.c config.c devices.c dhcp.c \ 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 usb.c user.c \ + system.c tape.c tcpip.c termcap.c ttys.c ufs.c user.c \ variable.c ${_wizard} keymap.h CFLAGS+= -DUSE_GZIP=1 diff --git a/usr.sbin/sysinstall/main.c b/usr.sbin/sysinstall/main.c index 695754b..d240584 100644 --- a/usr.sbin/sysinstall/main.c +++ b/usr.sbin/sysinstall/main.c @@ -120,12 +120,6 @@ main(int argc, char **argv) } #endif - /* Initialize USB, if we haven't already done so. */ - if (!pvariable_get("usbInitialize")) { - usbInitialize(); - pvariable_set("usbInitialize=1"); - } - /* Probe for all relevant devices on the system */ deviceGetAll(); diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c index 0154199..9b86eb3 100644 --- a/usr.sbin/sysinstall/menus.c +++ b/usr.sbin/sysinstall/menus.c @@ -1372,10 +1372,6 @@ DMenu MenuStartup = { { " pccard ifconfig", "List of PCCARD ethernet devices to configure", dmenuVarCheck, dmenuISetVariable, NULL, "pccard_ifconfig" }, #endif - { " usbd", "Enable USB daemon (detect USB attach / detach)", - dmenuVarCheck, dmenuToggleVariable, NULL, "usbd_enable=YES" }, - { " usbd flags", "Set default flags to usbd (if enabled)", - dmenuVarCheck, dmenuISetVariable, NULL, "usbd_flags" }, { " ", " -- ", NULL, NULL, NULL, NULL, ' ', ' ', ' ' }, { " Startup dirs", "Set the list of dirs to look for startup scripts", dmenuVarCheck, dmenuISetVariable, NULL, "local_startup" }, diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h index b5d8022..d099cca 100644 --- a/usr.sbin/sysinstall/sysinstall.h +++ b/usr.sbin/sysinstall/sysinstall.h @@ -843,9 +843,6 @@ extern void mediaShutdownUFS(Device *dev); extern Boolean mediaInitUFS(Device *dev); extern FILE *mediaGetUFS(Device *dev, char *file, Boolean probe); -/* usb.c */ -extern void usbInitialize(void); - /* user.c */ extern int userAddGroup(dialogMenuItem *self); extern int userAddUser(dialogMenuItem *self); diff --git a/usr.sbin/sysinstall/usb.c b/usr.sbin/sysinstall/usb.c deleted file mode 100644 index 4eedbd5..0000000 --- a/usr.sbin/sysinstall/usb.c +++ /dev/null @@ -1,44 +0,0 @@ -/* - * USB support for sysinstall - * - * $FreeBSD$ - * - * Copyright (c) 2000 John Baldwin <jhb@FreeBSD.org>. All rights reserved. - * - * This software may be used, modified, copied, and distributed, in - * both source and binary form provided that the above copyright and - * these terms are retained. Under no circumstances is the author - * responsible for the proper functioning of this software, nor does - * the author assume any responsibility for damages incurred with its - * use. - */ - -#include "sysinstall.h" -#include <sys/fcntl.h> -#include <sys/time.h> - -void -usbInitialize(void) -{ - int fd; - WINDOW *w; - - if (!RunningAsInit && !Fake) { - /* It's not my job... */ - return; - } - - if ((fd = open("/dev/usb", O_RDONLY)) < 0) { - msgDebug("Can't open USB controller.\n"); - return; - } - close(fd); - - w = savescr(); - msgNotify("Initializing USB controller...."); - - variable_set2("usbd_enable", "YES", 1); - - vsystem("/stand/usbd"); - restorescr(w); -} |