diff options
| author | Florent Villard <warly@mandriva.com> | 2005-04-07 11:13:55 +0000 |
|---|---|---|
| committer | Florent Villard <warly@mandriva.com> | 2005-04-07 11:13:55 +0000 |
| commit | b9488568314f25ccaf9e1b819e80ccfb99ac7613 (patch) | |
| tree | 618bde3ec4d70c48da5acf7acebfc41a58cefe78 | |
| parent | 8c1cef212ad85b8b7f24bef3575211190e41f62f (diff) | |
| download | bootsplash-b9488568314f25ccaf9e1b819e80ccfb99ac7613.tar bootsplash-b9488568314f25ccaf9e1b819e80ccfb99ac7613.tar.gz bootsplash-b9488568314f25ccaf9e1b819e80ccfb99ac7613.tar.bz2 bootsplash-b9488568314f25ccaf9e1b819e80ccfb99ac7613.tar.xz bootsplash-b9488568314f25ccaf9e1b819e80ccfb99ac7613.zip | |
fix text mode
| -rw-r--r-- | bootsplash.spec | 5 | ||||
| -rw-r--r-- | fb/fbmenu.c | 10 |
2 files changed, 9 insertions, 6 deletions
diff --git a/bootsplash.spec b/bootsplash.spec index 2ed0de2..5ef96f9 100644 --- a/bootsplash.spec +++ b/bootsplash.spec @@ -1,5 +1,5 @@ %define name bootsplash -%define version 3.1.7 +%define version 3.1.8 %define release 1mdk %define _bootdir /boot @@ -87,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/* %changelog +* Thu Apr 07 2005 Warly <warly@mandrakesoft.com> 3.1.8-1mdk +- fix text mode + * Wed Apr 06 2005 Warly <warly@mandrakesoft.com> 3.1.7-1mdk - Now fbmenu check that there are no duplicate entries diff --git a/fb/fbmenu.c b/fb/fbmenu.c index 850cd11..7773da1 100644 --- a/fb/fbmenu.c +++ b/fb/fbmenu.c @@ -168,19 +168,19 @@ int main(int argc, char **argv) { exit(0); } - fb = open("/dev/fb0",O_RDWR); - if (-1 == fb && getenv("DISPLAY") == NULL) { + fb = open("/dev/fb0", O_RDWR); + if (fb == -1) { signal(SIGALRM, return_default); alarm(atoi(argv[1])); do { fprintf(stderr,"\n"); - for (i = 0; i < nargc; i++) { - fprintf(stderr,"%d - %s\n", i + 1, nargv[i]); + for (i = 1; i <= nargc; i++) { + fprintf(stderr,"%d - %s\n", i, nargv[i]); } fprintf(stderr,"\n%s: ", argv[title]); if (!scanf("%d", &i)) scanf("%*s"); } while (i < 1 || i > nargc); - printf("\nRESULT=\"%s\"\n", nargv[i - 1]); + printf("\nRESULT=\"%s\"\n", nargv[i]); } else { gtk_init (&argc, &argv); do_button_box(window, nargc + 1, nargv); |