diff options
| author | Karel Zak | 2012-04-05 15:58:02 +0200 |
|---|---|---|
| committer | Karel Zak | 2012-04-05 15:58:28 +0200 |
| commit | 4f469e588df4f2867bd575a4c899135a9a41e9c4 (patch) | |
| tree | 38315dc405e5730b125778b7991d73f114416c57 /misc-utils | |
| parent | lsblk: count with terminating character, man page -s entry (diff) | |
| parent | tests: use eject --force (diff) | |
| download | kernel-qcow2-util-linux-4f469e588df4f2867bd575a4c899135a9a41e9c4.tar.gz kernel-qcow2-util-linux-4f469e588df4f2867bd575a4c899135a9a41e9c4.tar.xz kernel-qcow2-util-linux-4f469e588df4f2867bd575a4c899135a9a41e9c4.zip | |
Merge branch 'eject'
* eject: (47 commits)
tests: use eject --force
eject: use BUILD_EJECT, move to sys-utils
eject: clean up usage()
eject: clean up man page
eject: add --force option
eject: check for hotplug/removable attribute
eject: remove obsolete code, use EXIT_* macros
tests: add umount-by-eject tests
eject: improve work with partitioned devices
lib/sysfs: improve sysfs_is_partition_dirent()
eject: call umount <mountpoint> rather than <device>
eject: use libmount to detect if cdrom is mounted
eject: make the code robust
eject: use SG_IO ioctl for scsi
eject: support CDIOCEJECT ioctl
eject: new close_tray code from Fedora
eject: new auto_eject code from Fedora
eject: add -X from Fedora
eject: add --manualeject from fedora
eject: clean up devname usage
...
Diffstat (limited to 'misc-utils')
| -rw-r--r-- | misc-utils/.gitignore | 1 | ||||
| -rw-r--r-- | misc-utils/lslocks.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/misc-utils/.gitignore b/misc-utils/.gitignore index bde3ab8d9..927af2326 100644 --- a/misc-utils/.gitignore +++ b/misc-utils/.gitignore @@ -18,4 +18,3 @@ wipefs findmnt lsblk lslocks - diff --git a/misc-utils/lslocks.c b/misc-utils/lslocks.c index 0abc2a4bf..0631f684a 100644 --- a/misc-utils/lslocks.c +++ b/misc-utils/lslocks.c @@ -478,7 +478,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out) fprintf(out, _(" %s [options]\n"), program_invocation_short_name); - fputs(_("\nGeneral Options:\n"), out); + fputs(USAGE_OPTIONS, out); fputs(_(" -p, --pid <pid> process id\n" " -o, --output <list> define which output columns to use\n" " -n, --noheadings don't print headings\n" |