diff options
| author | Jeremy Katz <katzj@redhat.com> | 2003-12-01 22:23:43 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2003-12-01 22:23:43 +0000 |
| commit | aaa359c679693ca58fcde162529f65e15f97ca5e (patch) | |
| tree | 1c3f391169710b1b25d8252a3409ab5c2afaa48b | |
| parent | c348a3fbe61816d788fa60efd0ba59ad8b8519d1 (diff) | |
| download | anaconda-aaa359c679693ca58fcde162529f65e15f97ca5e.tar.gz anaconda-aaa359c679693ca58fcde162529f65e15f97ca5e.tar.xz anaconda-aaa359c679693ca58fcde162529f65e15f97ca5e.zip | |
usbfs and not usbdevfs now
| -rw-r--r-- | iutil.py | 2 | ||||
| -rw-r--r-- | loader2/usb.c | 4 | ||||
| -rw-r--r-- | packages.py | 4 |
3 files changed, 5 insertions, 5 deletions
@@ -481,7 +481,7 @@ def isUSBDevFSMounted(): lines = f.readlines() f.close() for l in lines: - if string.find(l, "usbdevfs") != -1: + if string.find(l, "usbfs") != -1: return 1 except: log("In isUSBMounted, failed to open /proc/mounts") diff --git a/loader2/usb.c b/loader2/usb.c index 8a2fec736..1b2a8f18c 100644 --- a/loader2/usb.c +++ b/loader2/usb.c @@ -96,9 +96,9 @@ int usbInitialize(moduleList modLoaded, moduleDeps modDeps, if (FL_TESTING(flags)) return 0; - if (doPwMount("/proc/bus/usb", "/proc/bus/usb", "usbdevfs", 0, 0, + if (doPwMount("/proc/bus/usb", "/proc/bus/usb", "usbfs", 0, 0, NULL, NULL, 0, 0)) - logMessage("failed to mount device usbdevfs: %s", strerror(errno)); + logMessage("failed to mount device usbfs: %s", strerror(errno)); /* sleep so we make sure usb devices get properly enumerated. that way we should block when initializing each usb driver until diff --git a/packages.py b/packages.py index e1aa65234..28bb9ad29 100644 --- a/packages.py +++ b/packages.py @@ -1073,7 +1073,7 @@ def doPostInstall(method, id, intf, instPath): unmountUSB = 0 try: - isys.mount('/usbdevfs', instPath+'/proc/bus/usb', 'usbdevfs') + isys.mount('/usbfs', instPath+'/proc/bus/usb', 'usbfs') unmountUSB = 1 except: log("Mount of /proc/bus/usb in chroot failed") @@ -1109,7 +1109,7 @@ def doPostInstall(method, id, intf, instPath): usbWasMounted = 0 if usbWasMounted: - isys.mount('/usbdevfs', '/proc/bus/usb', 'usbdevfs') + isys.mount('/usbfs', '/proc/bus/usb', 'usbfs') w.set(4) |