diff options
author | Mike Frysinger <vapier@gentoo.org> | 2005-09-18 22:05:23 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2005-09-18 22:05:23 +0000 |
commit | 8c32782ac459623358f9d0c694817abee45f12fd (patch) | |
tree | 1c8d8ed187331e9ae9265a9a6e4b8d0527f1362a /sys-apps | |
parent | Do autorecognizion of shell to use checking for file presence instead of basi... (diff) | |
download | gentoo-2-8c32782ac459623358f9d0c694817abee45f12fd.tar.gz gentoo-2-8c32782ac459623358f9d0c694817abee45f12fd.tar.bz2 gentoo-2-8c32782ac459623358f9d0c694817abee45f12fd.zip |
merged upstream
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/eject/files/eject-2.0.13-autoclose.patch | 2 | ||||
-rw-r--r-- | sys-apps/eject/files/eject-2.0.13-use-mountpoints.patch | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sys-apps/eject/files/eject-2.0.13-autoclose.patch b/sys-apps/eject/files/eject-2.0.13-autoclose.patch index 9d3662b19c05..c6a13a4b66fc 100644 --- a/sys-apps/eject/files/eject-2.0.13-autoclose.patch +++ b/sys-apps/eject/files/eject-2.0.13-autoclose.patch @@ -1,4 +1,4 @@ -Ripped from Fedora +Ripped from Fedora [has been merged upstream] --- eject.c Tue Jul 3 00:17:41 2001 +++ eject.c Tue Feb 5 05:50:58 2002 diff --git a/sys-apps/eject/files/eject-2.0.13-use-mountpoints.patch b/sys-apps/eject/files/eject-2.0.13-use-mountpoints.patch index 9b12992a7c28..a508c8196749 100644 --- a/sys-apps/eject/files/eject-2.0.13-use-mountpoints.patch +++ b/sys-apps/eject/files/eject-2.0.13-use-mountpoints.patch @@ -1,4 +1,4 @@ -Ripped from Fedora +Ripped from Fedora [merged upstream] More recent kernels actually want to umount using the mount point and not the device name (this makes more sense, you can have the same @@ -6,9 +6,8 @@ device mounted in many places). This is a minor changes to do just that. -diff --exclude=debian -Nur eject-2.0.13deb/eject.c eject-2.0.13deb.cw/eject.c ---- eject-2.0.13deb/eject.c 2004-04-17 12:25:10.000000000 -0700 -+++ eject-2.0.13deb.cw/eject.c 2004-04-17 12:26:55.000000000 -0700 +--- eject-2.0.13deb/eject.c ++++ eject-2.0.13deb/eject.c @@ -718,8 +718,8 @@ status = regexec(&preg, s1, 0, 0, 0); if (status == 0) { |