installer: change `atacontrol' to `natacontrol'
authorThomas Nikolajsen <thomas@dragonflybsd.org>
Sun, 8 Feb 2009 22:31:12 +0000 (23:31 +0100)
committerThomas Nikolajsen <thomas@dragonflybsd.org>
Sun, 8 Feb 2009 22:39:28 +0000 (23:39 +0100)
`atacontrol' doesn't work with default kernel, GENERIC,
as it uses `device nata'.

contrib/bsdinstaller-1.1.6/src/backend/installer/flow.c
contrib/bsdinstaller-1.1.6/src/backend/installer/fn.h
contrib/bsdinstaller-1.1.6/src/backend/installer/fn_diagnostic.c

index e9cfe34..c0ac3b0 100644 (file)
@@ -707,9 +707,9 @@ state_diagnostics_menu(struct i_fn_args *a)
                    "a", "pnpinfo",
                    _("Display Plug'n'Play ISA devices"),
                    _("Display Plug'n'Play ISA devices (pnpinfo)"), "",
-                   "a", "atacontrol",
+                   "a", "natacontrol",
                    _("Display ATA devices"),
-                   _("Display ATA devices (atactl)"), "",
+                   _("Display ATA devices (natacontrol)"), "",
                    NULL
                );
 
@@ -741,8 +741,8 @@ state_diagnostics_menu(struct i_fn_args *a)
                        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), "atacontrol") == 0) {
-                       fn_show_atacontrol(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), "memtest") == 0) {
                        fn_memtest(a);
                } else if (strcmp(dfui_response_get_action_id(r), "memtest86") == 0) {
index 1346e48..45b6221 100644 (file)
@@ -77,7 +77,7 @@ 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_atacontrol(struct i_fn_args *);
+void            fn_show_natacontrol(struct i_fn_args *);
 void            fn_memtest(struct i_fn_args *);
 
 void            view_memtest_log(struct i_fn_args *);
index 492b94f..1fb0f5b 100644 (file)
@@ -285,17 +285,17 @@ fn_show_pnpinfo(struct i_fn_args *a)
 }
 
 void
-fn_show_atacontrol(struct i_fn_args *a)
+fn_show_natacontrol(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, "atacontrol list");
+       aura_buffer_cat_pipe(e, "natacontrol list");
 
        f = dfui_form_create(
-           "atacontrol",
+           "natacontrol",
            _("ATA Devices"),
            aura_buffer_buf(e),
            "",