From 04bf803fa593ca20e7eec3d0e6cf7e86f83f2e57 Mon Sep 17 00:00:00 2001 From: Thomas Nikolajsen Date: Sun, 8 Feb 2009 23:31:12 +0100 Subject: [PATCH] installer: change `atacontrol' to `natacontrol' `atacontrol' doesn't work with default kernel, GENERIC, as it uses `device nata'. --- contrib/bsdinstaller-1.1.6/src/backend/installer/flow.c | 8 ++++---- contrib/bsdinstaller-1.1.6/src/backend/installer/fn.h | 2 +- contrib/bsdinstaller-1.1.6/src/backend/installer/fn_diagnostic.c | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/contrib/bsdinstaller-1.1.6/src/backend/installer/flow.c b/contrib/bsdinstaller-1.1.6/src/backend/installer/flow.c index e9cfe34d1b..c0ac3b096a 100644 --- a/contrib/bsdinstaller-1.1.6/src/backend/installer/flow.c +++ b/contrib/bsdinstaller-1.1.6/src/backend/installer/flow.c @@ -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) { diff --git a/contrib/bsdinstaller-1.1.6/src/backend/installer/fn.h b/contrib/bsdinstaller-1.1.6/src/backend/installer/fn.h index 1346e4897a..45b622128d 100644 --- a/contrib/bsdinstaller-1.1.6/src/backend/installer/fn.h +++ b/contrib/bsdinstaller-1.1.6/src/backend/installer/fn.h @@ -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 *); diff --git a/contrib/bsdinstaller-1.1.6/src/backend/installer/fn_diagnostic.c b/contrib/bsdinstaller-1.1.6/src/backend/installer/fn_diagnostic.c index 492b94f960..1fb0f5b9bf 100644 --- a/contrib/bsdinstaller-1.1.6/src/backend/installer/fn_diagnostic.c +++ b/contrib/bsdinstaller-1.1.6/src/backend/installer/fn_diagnostic.c @@ -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), "", -- 2.11.4.GIT