old
/
entrance
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

entrance: typo in configure.ac and fix compil with --enable-grub2. Big thx to Igor Murzov 

SVN revision: 76874
This commit is contained in:
Michael BOUCHAUD 2012-09-19 19:24:33 +00:00
parent f884d69dc9
commit dc775b5cb8
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -47,7 +47,7 @@ AC_MSG_RESULT([${enable_pam}])
# Grub2
AC_ARG_ENABLE([grub2],
[AC_HELP_STRING([--enable-gru2b], [enable grub2 support. @<:@default=disabled@:>@])],
[AC_HELP_STRING([--enable-grub2], [enable grub2 support. @<:@default=disabled@:>@])],
[
if test "x${enableval}" = "xyes" ; then
enable_grub2="yes"
@ -80,7 +80,7 @@ AC_MSG_RESULT([${enable_consolekit}])
# Set edje_cc path
AC_ARG_WITH([edje-cc],
[AC_HELP_STRING([ --with-edje-cc=PATH], [specify a specific path to edje_cc])],
[AC_HELP_STRING([--with-edje-cc=PATH], [specify a specific path to edje_cc])],
[
v=$withval;
edje_cc=$v

8
src/daemon/entrance_action.c
View File

@ -211,13 +211,14 @@ _entrance_action_grub2_get(void)
if (!grub2_ok)
{
grub2_ok = 1;
PT("GRUB2 save mode found \n");
PT("GRUB2 save mode found\n");
}
else
{
char *action;
char *local;
char *tmp;
char *buf;
r2 += 10;
size -= 10;
@ -237,8 +238,11 @@ _entrance_action_grub2_get(void)
action = malloc((tmp - r2 + 1 + 11) * sizeof (char));
if (!action) goto end_line;
buf = alloca((tmp - r2 + 1 + 11 + 10) * sizeof (char));
sprintf(action, "Reboot on %s", local);
PT("GRUB2 '%s'\n", action);
sprintf(buf, "GRUB2 '%s'\n", action);
PT(buf);
_entrance_actions =
eina_list_append(_entrance_actions,
_entrance_action_add(action,