installer: Remove pnpinfo configuration option.
authorSascha Wildner <saw@online.de>
Sun, 19 May 2013 14:05:10 +0000 (16:05 +0200)
committerSascha Wildner <saw@online.de>
Mon, 20 May 2013 09:38:36 +0000 (11:38 +0200)
pnpinfo(8) is i386 only. Also, it's easy enough to review it by logging
in as root.

Suggested-by: ftigeot
usr.sbin/installer/dfuibe_installer/flow.c
usr.sbin/installer/dfuibe_installer/fn.h
usr.sbin/installer/dfuibe_installer/fn_diagnostic.c

index c6b49bf..cf175ec 100644 (file)
@@ -702,9 +702,6 @@ state_diagnostics_menu(struct i_fn_args *a)
                    "a", "pciconf",
                    _("Display PCI devices"),
                    _("Display PCI devices (pciconf)"), "",
-                   "a", "pnpinfo",
-                   _("Display Plug'n'Play ISA devices"),
-                   _("Display Plug'n'Play ISA devices (pnpinfo)"), "",
                    "a", "natacontrol",
                    _("Display ATA devices"),
                    _("Display ATA devices (natacontrol)"), "",
@@ -723,8 +720,6 @@ state_diagnostics_menu(struct i_fn_args *a)
                        fn_show_dmesg(a);
                } else if (strcmp(dfui_response_get_action_id(r), "pciconf") == 0) {
                        fn_show_pciconf(a);
-               } else if (strcmp(dfui_response_get_action_id(r), "pnpinfo") == 0) {
-                       fn_show_pnpinfo(a);
                } else if (strcmp(dfui_response_get_action_id(r), "natacontrol") == 0) {
                        fn_show_natacontrol(a);
                } else if (strcmp(dfui_response_get_action_id(r), "cancel") == 0) {
index 1f0a663..7edfb9d 100644 (file)
@@ -76,7 +76,6 @@ void           fn_assign_ip(struct i_fn_args *);
 
 void            fn_show_dmesg(struct i_fn_args *);
 void            fn_show_pciconf(struct i_fn_args *);
-void            fn_show_pnpinfo(struct i_fn_args *);
 void            fn_show_natacontrol(struct i_fn_args *);
 
 void            show_ifconfig(struct dfui_connection *, char *);
index 79a6b12..2e7cfb7 100644 (file)
@@ -139,41 +139,6 @@ fn_show_pciconf(struct i_fn_args *a)
        aura_buffer_free(e);
 }
 
-void
-fn_show_pnpinfo(struct i_fn_args *a)
-{
-       struct aura_buffer *e;
-       struct dfui_form *f;
-       struct dfui_response *r;
-
-       e = aura_buffer_new(1024);
-       aura_buffer_cat_pipe(e, "pnpinfo");
-
-       f = dfui_form_create(
-           "pnpinfo",
-           _("ISA PnP Devices"),
-           aura_buffer_buf(e),
-           "",
-
-           "p", "role", "informative",
-           "p", "minimum_width", "72",
-           "p", "monospaced", "true",
-
-           "a", "ok", _("OK"), "", "",
-           "p", "accelerator", "ESC",
-
-           NULL
-       );
-
-       if (!dfui_be_present(a->c, f, &r))
-               abort_backend();
-
-       dfui_form_free(f);
-       dfui_response_free(r);
-
-       aura_buffer_free(e);
-}
-
 void
 fn_show_natacontrol(struct i_fn_args *a)
 {