diff options
| author | LaMont Jones <lamont@debian.org> | 2010-02-03 16:26:41 -0700 |
|---|---|---|
| committer | LaMont Jones <lamont@debian.org> | 2010-02-03 16:26:41 -0700 |
| commit | 2bd3ccad2133d3aefdc2caeb3034c0725414d2e9 (patch) | |
| tree | 64db9a6968f1d398d386ddc1d46d2e0a7396ff44 /include | |
| parent | c3701c1d965cdc905bd580ece68a1c4008b4d1b0 (diff) | |
| parent | cdfb1e88228c10c28f8bfe0f4b0ff1b3b06d1ed4 (diff) | |
| download | util-linux-old-2bd3ccad2133d3aefdc2caeb3034c0725414d2e9.tar.gz | |
Merge remote branch 'origin/master'
Conflicts:
tests/ts/blkid/images-fs/adaptec-raid.img.bz2
tests/ts/blkid/images-fs/ddf-raid.img.bz2
tests/ts/blkid/images-fs/gfs2.img.bz2
tests/ts/blkid/images-fs/hpt37x-raid.img.bz2
tests/ts/blkid/images-fs/isw-raid.img.bz2
tests/ts/blkid/images-fs/jbd.img.bz2
tests/ts/blkid/images-fs/jmicron-raid.img.bz2
tests/ts/blkid/images-fs/lvm2.img.bz2
tests/ts/blkid/images-fs/nvidia-raid.img.bz2
tests/ts/blkid/images-fs/ocfs2.img.bz2
tests/ts/blkid/images-fs/promise-raid.img.bz2
tests/ts/blkid/images-fs/reiser4.img.bz2
tests/ts/blkid/images-fs/romfs.img.bz2
tests/ts/blkid/images-fs/silicon-raid.img.bz2
tests/ts/blkid/images-fs/swap0.img.bz2
tests/ts/blkid/images-fs/swap1.img.bz2
tests/ts/blkid/images-fs/via-raid.img.bz2
tests/ts/blkid/images-fs/vmfs_volume.img.bz2
tests/ts/blkid/images-fs/zfs.img.bz2
Diffstat (limited to 'include')
| -rw-r--r-- | include/pathnames.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/pathnames.h b/include/pathnames.h index efe5c3bc..9c4eb009 100644 --- a/include/pathnames.h +++ b/include/pathnames.h @@ -76,6 +76,8 @@ #define _PATH_PROC_PARTITIONS "/proc/partitions" #define _PATH_PROC_DEVICES "/proc/devices" +#define _PATH_SYS_BLOCK "/sys/block" + #ifndef _PATH_MOUNTED # ifdef MOUNTED /* deprecated */ # define _PATH_MOUNTED MOUNTED |