diff options
| -rw-r--r-- | Config.h | 4 | ||||
| -rw-r--r-- | chroot.c | 2 | ||||
| -rw-r--r-- | coreutils/chroot.c | 2 | ||||
| -rw-r--r-- | debian/Config.h-deb | 4 | ||||
| -rw-r--r-- | debian/Config.h-static | 4 | ||||
| -rw-r--r-- | debian/Config.h-udeb | 4 |
6 files changed, 2 insertions, 18 deletions
@@ -462,15 +462,11 @@ #endif // #if defined BB_ASH && defined BB_FEATURE_SH_IS_ASH -# define BB_SH # define shell_main ash_main #elif defined BB_HUSH && defined BB_FEATURE_SH_IS_HUSH -# define BB_SH # define shell_main hush_main #elif defined BB_LASH && defined BB_FEATURE_SH_IS_LASH -# define BB_SH # define shell_main lash_main #elif defined BB_MSH && defined BB_FEATURE_SH_IS_MSH -# define BB_SH # define shell_main msh_main #endif @@ -48,7 +48,7 @@ int chroot_main(int argc, char **argv) prog = *argv; execvp(*argv, argv); } else { -#if defined(BB_SH) && defined BB_FEATURE_SH_STANDALONE_SHELL +#if defined shell_main && defined BB_FEATURE_SH_STANDALONE_SHELL char shell[] = "/bin/sh"; char *shell_argv[2] = { shell, NULL }; applet_name = shell; diff --git a/coreutils/chroot.c b/coreutils/chroot.c index 0440e46b9..de6a2ea50 100644 --- a/coreutils/chroot.c +++ b/coreutils/chroot.c @@ -48,7 +48,7 @@ int chroot_main(int argc, char **argv) prog = *argv; execvp(*argv, argv); } else { -#if defined(BB_SH) && defined BB_FEATURE_SH_STANDALONE_SHELL +#if defined shell_main && defined BB_FEATURE_SH_STANDALONE_SHELL char shell[] = "/bin/sh"; char *shell_argv[2] = { shell, NULL }; applet_name = shell; diff --git a/debian/Config.h-deb b/debian/Config.h-deb index 892ce1303..fd848e192 100644 --- a/debian/Config.h-deb +++ b/debian/Config.h-deb @@ -459,15 +459,11 @@ #endif // #if defined BB_ASH && defined BB_FEATURE_SH_IS_ASH -# define BB_SH # define shell_main ash_main #elif defined BB_HUSH && defined BB_FEATURE_SH_IS_HUSH -# define BB_SH # define shell_main hush_main #elif defined BB_LASH && defined BB_FEATURE_SH_IS_LASH -# define BB_SH # define shell_main lash_main #elif defined BB_MSH && defined BB_FEATURE_SH_IS_MSH -# define BB_SH # define shell_main msh_main #endif diff --git a/debian/Config.h-static b/debian/Config.h-static index 71f6df0d0..094b1f9b4 100644 --- a/debian/Config.h-static +++ b/debian/Config.h-static @@ -459,15 +459,11 @@ #endif // #if defined BB_ASH && defined BB_FEATURE_SH_IS_ASH -# define BB_SH # define shell_main ash_main #elif defined BB_HUSH && defined BB_FEATURE_SH_IS_HUSH -# define BB_SH # define shell_main hush_main #elif defined BB_LASH && defined BB_FEATURE_SH_IS_LASH -# define BB_SH # define shell_main lash_main #elif defined BB_MSH && defined BB_FEATURE_SH_IS_MSH -# define BB_SH # define shell_main msh_main #endif diff --git a/debian/Config.h-udeb b/debian/Config.h-udeb index 51446ff89..8e7594dc4 100644 --- a/debian/Config.h-udeb +++ b/debian/Config.h-udeb @@ -459,15 +459,11 @@ #endif // #if defined BB_ASH && defined BB_FEATURE_SH_IS_ASH -# define BB_SH # define shell_main ash_main #elif defined BB_HUSH && defined BB_FEATURE_SH_IS_HUSH -# define BB_SH # define shell_main hush_main #elif defined BB_LASH && defined BB_FEATURE_SH_IS_LASH -# define BB_SH # define shell_main lash_main #elif defined BB_MSH && defined BB_FEATURE_SH_IS_MSH -# define BB_SH # define shell_main msh_main #endif |