diff --git a/ChangeLog b/ChangeLog index e5606fd57..543a30697 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-10-19 Vladimir Serbinenko + + * grub-core/osdep/unix/exec.c: Fix compilation error on emu. + 2013-10-19 Vladimir Serbinenko * grub-core/kern/misc.c (grub_vsnprintf_real): Fix formatting of diff --git a/grub-core/osdep/unix/exec.c b/grub-core/osdep/unix/exec.c index 575377fe7..239a68b32 100644 --- a/grub-core/osdep/unix/exec.c +++ b/grub-core/osdep/unix/exec.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -46,8 +47,10 @@ grub_util_exec (const char *const *argv) /* Child. */ /* Close fd's. */ +#ifdef GRUB_UTIL grub_util_devmapper_cleanup (); grub_diskfilter_fini (); +#endif /* Ensure child is not localised. */ setenv ("LC_ALL", "C", 1); @@ -78,8 +81,10 @@ grub_util_exec_redirect (const char *const *argv, const char *stdin_file, /* Child. */ /* Close fd's. */ +#ifdef GRUB_UTIL grub_util_devmapper_cleanup (); grub_diskfilter_fini (); +#endif in = open (stdin_file, O_RDONLY); dup2 (in, STDIN_FILENO); @@ -129,8 +134,10 @@ grub_util_exec_pipe (const char *const *argv, int *fd) /* Child. */ /* Close fd's. */ +#ifdef GRUB_UTIL grub_util_devmapper_cleanup (); grub_diskfilter_fini (); +#endif /* Ensure child is not localised. */ setenv ("LC_ALL", "C", 1); @@ -172,8 +179,10 @@ grub_util_exec_pipe_stderr (const char *const *argv, int *fd) /* Child. */ /* Close fd's. */ +#ifdef GRUB_UTIL grub_util_devmapper_cleanup (); grub_diskfilter_fini (); +#endif /* Ensure child is not localised. */ setenv ("LC_ALL", "C", 1);