remove left-over from ignore_remove and all_partitions

[elogind.git] / udev / udevadm-trigger.c

diff --git a/udev/udevadm-trigger.c b/udev/udevadm-trigger.c
index a97feb79b349c863c872980587b5d8f10e756c7c..03aa53437f17a034f2ebb8a2a8e6232702a54efa 100644 (file)
--- a/udev/udevadm-trigger.c
+++ b/udev/udevadm-trigger.c
@@ -95,7 +95,6 @@ int udevadm_trigger(struct udev *udev, int argc, char *argv[])
                { "verbose", no_argument, NULL, 'v' },
                { "dry-run", no_argument, NULL, 'n' },
                { "type", required_argument, NULL, 't' },
-               { "retry-failed", no_argument, NULL, 'F' },
                { "action", required_argument, NULL, 'c' },
                { "subsystem-match", required_argument, NULL, 's' },
                { "subsystem-nomatch", required_argument, NULL, 'S' },
@@ -111,7 +110,7 @@ int udevadm_trigger(struct udev *udev, int argc, char *argv[])
                TYPE_SUBSYSTEMS,
                TYPE_FAILED,
        } device_type = TYPE_DEVICES;
-       const char *action = "add";
+       const char *action = "change";
        struct udev_enumerate *udev_enumerate;
        int rc = 0;
 
@@ -147,15 +146,11 @@ int udevadm_trigger(struct udev *udev, int argc, char *argv[])
                        } else if (strcmp(optarg, "failed") == 0) {
                                device_type = TYPE_FAILED;
                        } else {
-                               fprintf(stderr, "unknown type --type=%s\n", optarg);
                                err(udev, "unknown type --type=%s\n", optarg);
                                rc = 2;
                                goto exit;
                        }
                        break;
-               case 'F':
-                       device_type = TYPE_FAILED;
-                       break;
                case 'c':
                        action = optarg;
                        break;
@@ -189,9 +184,9 @@ int udevadm_trigger(struct udev *udev, int argc, char *argv[])
                               "      subsystems                    sys subsystems and drivers\n"
                               "      failed                        trigger only the events which have been\n"
                               "                                    marked as failed during a previous run\n"
-                              "  --action=<action>               event action value, default is \"add\"\n"
-                              "  --subsystem-match=<subsystem>   trigger devices from a matching subystem\n"
-                              "  --subsystem-nomatch=<subsystem> exclude devices from a matching subystem\n"
+                              "  --action=<action>               event action value, default is \"change\"\n"
+                              "  --subsystem-match=<subsystem>   trigger devices from a matching subsystem\n"
+                              "  --subsystem-nomatch=<subsystem> exclude devices from a matching subsystem\n"
                               "  --attr-match=<file[=<value>]>   trigger devices with a matching attribute\n"
                               "  --attr-nomatch=<file[=<value>]> exclude devices with a matching attribute\n"
                               "  --property-match=<key>=<value>  trigger devices with a matching property\n"