mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

45 lines
1.7 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/base/util-linux/nice-mount-paths.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  19. --- ./mount/mount.c.orig Wed Mar 21 10:07:59 2001
  20. +++ ./mount/mount.c Wed Mar 21 10:12:15 2001
  21. @@ -1061,6 +1061,23 @@
  22. /* Substitute values in opts, if required */
  23. opts = usersubst(opts);
  24. + /* make the node a nice absolute path name */
  25. + if (node[0] && node[0]!='/') {
  26. + char *thisdir=get_current_dir_name();
  27. + char *oldnode=node;
  28. + if (chdir(node) == 0) {
  29. + /* we will never free this variable ... */
  30. + node=get_current_dir_name();
  31. + chdir(thisdir);
  32. + if (verbose) printf("mount: change '%s' to '%s'\n",oldnode,node);
  33. + }
  34. + free(thisdir);
  35. + }
  36. + if (strlen(node)>=3 && node[strlen(node)-1]=='/') {
  37. + if (verbose) printf("mount: remove the leading '/' in '%s'\n",node);
  38. + node[strlen(node)-1]=0;
  39. + }
  40. +
  41. /* Merge the fstab and command line options. */
  42. if (opts == NULL)
  43. opts = cmdlineopts;