Author: sthibault
Date: 2013-08-29 00:03:51 +0000 (Thu, 29 Aug 2013)
New Revision: 5691
Added:
glibc-package/trunk/debian/patches/hurd-i386/submitted-path_mounted.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/hurd-i386/submitted-startup-pid2.diff
glibc-package/trunk/debian/patches/series
Log:
* patches/hurd-i386/submitted-path_mounted.diff: New patch from Justus
Winter to fix hurd-i386's _PATH_MOUNTED according to Debian usage.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2013-08-28 23:59:08 UTC (rev
5690)
+++ glibc-package/trunk/debian/changelog 2013-08-29 00:03:51 UTC (rev
5691)
@@ -11,6 +11,8 @@
* Update hurd-i386 testsuite progressions.
* patches/hurd-i386/submitted-startup-pid2.diff: New patch from Justus
Winter to prepare reboot() for /hurd/init getting PID 2 instead of 1.
+ * patches/hurd-i386/submitted-path_mounted.diff: New patch from Justus
+ Winter to fix hurd-i386's _PATH_MOUNTED according to Debian usage.
-- Adam Conrad <[email protected]> Thu, 01 Aug 2013 23:00:51 +0100
Added: glibc-package/trunk/debian/patches/hurd-i386/submitted-path_mounted.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/submitted-path_mounted.diff
(rev 0)
+++ glibc-package/trunk/debian/patches/hurd-i386/submitted-path_mounted.diff
2013-08-29 00:03:51 UTC (rev 5691)
@@ -0,0 +1,41 @@
+http://sourceware.org/ml/libc-alpha/2013-08/msg00207.html
+
+From: Justus Winter <[email protected]>
+To: [email protected]
+Subject: [PATCH 2/2] Define _PATH_MOUNTED as "/etc/mtab"
+Date: Thu, 15 Aug 2013 10:43:35 +0200
+
+Change the definition of _PATH_MOUNTED to "/etc/mtab". This is the
+value used on Linux.
+
+The change is motivated by the fact that on Debian /etc/mtab is a
+symbolic link to /proc/mounts. This patch adjusts the macro for
+non-linux systems such as Hurd. Changing this using
+sysdeps/mach/hurd/paths.h causes build problems because
+/usr/include/hurd/paths.h is shadowed by this file. This change is
+proposed in the hope that aligning the non-linux targets with the
+glibc for Linux is perceived as a good thing while fixing this problem
+on Debian/Hurd along the way.
+
+* sysdeps/generic/paths.h (_PATH_MOUNTED): Change value to "/etc/mtab".
+---
+ sysdeps/generic/paths.h | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/sysdeps/generic/paths.h b/sysdeps/generic/paths.h
+index 893b4c2..6b8f440 100644
+--- a/sysdeps/generic/paths.h
++++ b/sysdeps/generic/paths.h
+@@ -51,7 +51,7 @@
+ #define _PATH_MAN "/usr/share/man"
+ #define _PATH_MEM "/dev/mem"
+ #define _PATH_MNTTAB "/etc/fstab"
+-#define _PATH_MOUNTED "/var/run/mtab"
++#define _PATH_MOUNTED "/etc/mtab"
+ #define _PATH_NOLOGIN "/etc/nologin"
+ #define _PATH_PRESERVE "/var/lib"
+ #define _PATH_RWHODIR "/var/spool/rwho"
+--
+1.7.10.4
+
+
Modified:
glibc-package/trunk/debian/patches/hurd-i386/submitted-startup-pid2.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/submitted-startup-pid2.diff
2013-08-28 23:59:08 UTC (rev 5690)
+++ glibc-package/trunk/debian/patches/hurd-i386/submitted-startup-pid2.diff
2013-08-29 00:03:51 UTC (rev 5691)
@@ -16,7 +16,6 @@
* sysdeps/mach/hurd/reboot.c (reboot): Try to send a startup_reboot
message to both pid 1 and 2.
---
- ChangeLog | 5 +++++
sysdeps/mach/hurd/reboot.c | 13 +++++++++----
2 files changed, 14 insertions(+), 4 deletions(-)
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2013-08-28 23:59:08 UTC (rev
5690)
+++ glibc-package/trunk/debian/patches/series 2013-08-29 00:03:51 UTC (rev
5691)
@@ -127,6 +127,7 @@
hurd-i386/tg-context_functions.diff
hurd-i386/unsubmitted-clock_t_centiseconds.diff
hurd-i386/submitted-startup-pid2.diff
+hurd-i386/submitted-path_mounted.diff
i386/local-biarch.diff
i386/local-cmov.diff
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
