summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/udev/udevadm-settle.c19
1 files changed, 15 insertions, 4 deletions
diff --git a/src/udev/udevadm-settle.c b/src/udev/udevadm-settle.c
index 9eab8b2a21..6bcb3a985e 100644
--- a/src/udev/udevadm-settle.c
+++ b/src/udev/udevadm-settle.c
@@ -48,12 +48,12 @@ static void help(void) {
static int adm_settle(struct udev *udev, int argc, char *argv[]) {
static const struct option options[] = {
- { "seq-start", required_argument, NULL, '\0' }, /* removed */
- { "seq-end", required_argument, NULL, '\0' }, /* removed */
{ "timeout", required_argument, NULL, 't' },
{ "exit-if-exists", required_argument, NULL, 'E' },
- { "quiet", no_argument, NULL, 'q' }, /* removed */
{ "help", no_argument, NULL, 'h' },
+ { "seq-start", required_argument, NULL, 's' }, /* removed */
+ { "seq-end", required_argument, NULL, 'e' }, /* removed */
+ { "quiet", no_argument, NULL, 'q' }, /* removed */
{}
};
const char *exists = NULL;
@@ -63,8 +63,9 @@ static int adm_settle(struct udev *udev, int argc, char *argv[]) {
struct udev_queue *queue;
int rc = EXIT_FAILURE;
- while ((c = getopt_long(argc, argv, "s:e:t:E:qh", options, NULL)) >= 0) {
+ while ((c = getopt_long(argc, argv, "t:E:hs:e:q", options, NULL)) >= 0) {
switch (c) {
+
case 't': {
int r;
@@ -76,14 +77,24 @@ static int adm_settle(struct udev *udev, int argc, char *argv[]) {
};
break;
}
+
case 'E':
exists = optarg;
break;
+
case 'h':
help();
return EXIT_SUCCESS;
+
+ case 's':
+ case 'e':
+ case 'q':
+ log_info("Option -%c no longer supported.", c);
+ return EXIT_FAILURE;
+
case '?':
return EXIT_FAILURE;
+
default:
assert_not_reached("Unknown argument");
}