diff options
| author | LaMont Jones <lamont@debian.org> | 2009-07-21 15:45:04 -0600 |
|---|---|---|
| committer | LaMont Jones <lamont@debian.org> | 2009-07-21 15:45:04 -0600 |
| commit | 7a22bb9abcb56d1010cefd204709e3888f95f735 (patch) | |
| tree | 5c38b4485f79ee8f6a9d5f9537e973f1f663f027 /include | |
| parent | 4e13a18f57a5b427c559f3b466b9655db14d28f8 (diff) | |
| parent | 741064af10ec81635d708e9fb8373f96341246eb (diff) | |
| download | util-linux-old-7a22bb9abcb56d1010cefd204709e3888f95f735.tar.gz | |
Merge commit 'origin/master'
Conflicts:
AUTHORS
NEWS
config/include-Makefile.am
configure.ac
mount/lomount.c
po/POTFILES.in
po/ca.po
po/cs.po
po/da.po
po/de.po
po/es.po
po/et.po
po/eu.po
po/fi.po
po/fr.po
po/hu.po
po/id.po
po/it.po
po/ja.po
po/nl.po
po/pl.po
po/pt_BR.po
po/ru.po
po/sl.po
po/sv.po
po/tr.po
po/uk.po
po/util-linux-ng.pot
po/vi.po
po/zh_CN.po
Diffstat (limited to 'include')
| -rw-r--r-- | include/pathnames.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/pathnames.h b/include/pathnames.h index 0060a756..ead448e3 100644 --- a/include/pathnames.h +++ b/include/pathnames.h @@ -19,7 +19,6 @@ #undef _PATH_DEFPATH_ROOT #define _PATH_DEFPATH_ROOT "/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" -#define _PATH_TTY "/dev/tty" #define _PATH_SECURETTY "/etc/securetty" #define _PATH_WTMPLOCK "/etc/wtmplock" @@ -94,6 +93,13 @@ #define _PATH_MOUNTED_LOCK _PATH_MOUNTED "~" #define _PATH_MOUNTED_TMP _PATH_MOUNTED ".tmp" +#ifndef _PATH_DEV +# define _PATH_DEV "/dev/" +#endif + +#define _PATH_DEV_LOOP "/dev/loop" +#define _PATH_DEV_TTY "/dev/tty" + /* udev paths */ #define _PATH_DEV_BYLABEL "/dev/disk/by-label" #define _PATH_DEV_BYUUID "/dev/disk/by-uuid" |