commit-hurd
[Top][All Lists]
Advanced

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

[hurd] 01/01: fix spurious ./ in mtab paths, to fix d-i's grub-installer


From: Samuel Thibault
Subject: [hurd] 01/01: fix spurious ./ in mtab paths, to fix d-i's grub-installer
Date: Thu, 18 Dec 2014 23:42:36 +0000

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch master
in repository hurd.

commit 9dca44893a277b83cae550a0ee3f6f1a4370c0d7
Author: Samuel Thibault <address@hidden>
Date:   Thu Dec 18 23:42:03 2014 +0000

    fix spurious ./ in mtab paths, to fix d-i's grub-installer
---
 debian/changelog                    |  7 +++++
 debian/patches/git-mtab-paths.patch | 54 +++++++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 62 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 95c8142..4a18369 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+hurd (1:0.5.git20141210-5) UNRELEASED; urgency=medium
+
+  * patches/git-mtab-paths.patch: Cherry-pick patch to fix spurious ./ in mtab
+    paths, to fix d-i's grub-installer.
+
+ -- Samuel Thibault <address@hidden>  Thu, 18 Dec 2014 23:40:22 +0000
+
 hurd (1:0.5.git20141210-4) unstable; urgency=medium
 
   * hurd-udeb.install.in: Add /hurd/startup.
diff --git a/debian/patches/git-mtab-paths.patch 
b/debian/patches/git-mtab-paths.patch
new file mode 100644
index 0000000..29f34ae
--- /dev/null
+++ b/debian/patches/git-mtab-paths.patch
@@ -0,0 +1,54 @@
+commit 8e3c26e98bcf30dd73a8c64bb9aab08e2f32c1f8
+Author: Samuel Thibault <address@hidden>
+Date:   Fri Dec 19 00:12:07 2014 +0100
+
+    Avoid ./ components in mtab output
+    
+    * libdiskfs/dir-lookup.c (diskfs_S_dir_lookup): Match "." path as being the
+    root directory.
+    * libnetfs/dir-lookup.c (netfs_S_dir_lookup): Likewise.
+
+diff --git a/libdiskfs/dir-lookup.c b/libdiskfs/dir-lookup.c
+index e228745..f3364cd 100644
+--- a/libdiskfs/dir-lookup.c
++++ b/libdiskfs/dir-lookup.c
+@@ -327,7 +327,7 @@ diskfs_S_dir_lookup (struct protid *dircred,
+                     translator_path[end - path_start] = '\0';
+                   }
+ 
+-                if (dircred->po->path == NULL)
++                if (dircred->po->path == NULL || !strcmp 
(dircred->po->path,"."))
+                     /* dircred is the root directory.  */
+                     complete_path = translator_path;
+                 else
+@@ -528,7 +528,7 @@ diskfs_S_dir_lookup (struct protid *dircred,
+   if (! error)
+     {
+       free (newpi->po->path);
+-      if (dircred->po->path == NULL)
++      if (dircred->po->path == NULL || !strcmp (dircred->po->path,"."))
+       {
+         /* dircred is the root directory.  */
+         newpi->po->path = relpath;
+diff --git a/libnetfs/dir-lookup.c b/libnetfs/dir-lookup.c
+index 77cbbbd..7ca526b 100644
+--- a/libnetfs/dir-lookup.c
++++ b/libnetfs/dir-lookup.c
+@@ -310,7 +310,7 @@ netfs_S_dir_lookup (struct protid *diruser,
+                     translator_path[end - filename_start] = '\0';
+                   }
+ 
+-                if (diruser->po->path == NULL)
++                if (diruser->po->path == NULL || !strcmp 
(diruser->po->path,"."))
+                     /* diruser is the root directory.  */
+                     complete_path = translator_path;
+                 else
+@@ -444,7 +444,7 @@ netfs_S_dir_lookup (struct protid *diruser,
+     }
+ 
+   free (newpi->po->path);
+-  if (diruser->po->path == NULL)
++  if (diruser->po->path == NULL || !strcmp (diruser->po->path,"."))
+     {
+       /* diruser is the root directory.  */
+       newpi->po->path = relpath;
diff --git a/debian/patches/series b/debian/patches/series
index 806adcd..f5e85ee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -43,3 +43,4 @@ MAKEDEV-apm.patch
 newRPC.patch
 libmachdev-link.patch
 ports_h_loop.patch
+git-mtab-paths.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/hurd.git



reply via email to

[Prev in Thread] Current Thread [Next in Thread]