[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

hurd 20010426 snapshot (hacking around cdrom lock problem)



Hi,

A new Debian package of the Hurd is on the way. Version is 20010426, and it
is a current snapshot with all past patches plus a hack to avoid the CD ROM
eject lock problem. So with settrans -ag /cdrom, you can eject the CD.

The hack is too horrible to apply it to the CVS tree, isn't it?

Thanks,
Marcus

diff -ru /mnt/marcus/gnu/cvs/hurd/storeio/dev.c /mnt/marcus/gnu/hurd/hurd/hurd-20010426/storeio/dev.c
--- /mnt/marcus/gnu/cvs/hurd/storeio/dev.c	Sun Feb 18 20:53:59 2001
+++ /mnt/marcus/gnu/hurd/hurd/hurd-20010426/storeio/dev.c	Fri Apr 27 00:47:58 2001
@@ -145,18 +145,20 @@
       /* This means we had no store arguments.
 	 We are to operate on our underlying node. */
       err = store_create (storeio_fsys->underlying,
-			  STORE_INACTIVE | (dev->readonly ? STORE_READONLY : 0),
+			  dev->readonly ? STORE_READONLY : 0,
 			  0, &dev->store);
-
     }
   else
     /* Open based on the previously parsed store arguments.  */
     err = store_parsed_open (dev->store_name,
-			     STORE_INACTIVE
-			     | (dev->readonly ? STORE_READONLY : 0),
+			     dev->readonly ? STORE_READONLY : 0,
 			     &dev->store);
   if (err)
     return err;
+
+  /* Inactivate the store, it will be activated at first access.
+     We ignore possible EINVAL here.  */
+  store_set_flags (dev->store, STORE_INACTIVE);
 
   dev->buf = mmap (0, dev->store->block_size, PROT_READ|PROT_WRITE,
 		   MAP_ANON, 0, 0);

-- 
`Rhubarb is no Egyptian god.' Debian http://www.debian.org brinkmd@debian.org
Marcus Brinkmann              GNU    http://www.gnu.org    marcus@gnu.org
Marcus.Brinkmann@ruhr-uni-bochum.de
http://www.marcus-brinkmann.de



Reply to: