[PATCH v2 1/2] Replace echo with printf builtin in nscd init script

[PATCH v2 1/2] Replace echo with printf builtin in nscd init script

[Khem Raj]

The nscd init script calls for #! /bin/bash interpreter
since it uses bash specific extentions namely (translated strings)
and echo -n command, replace echo with printf and
switch the shell interpreter to #!/bin/sh.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
v2: Replace echo with printf
    Try to improve commit msg

 nscd/nscd.init | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/nscd/nscd.init b/nscd/nscd.init
index a882da7d8b..857b541381 100644
--- a/nscd/nscd.init
+++ b/nscd/nscd.init
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #
 # nscd:		Starts the Name Switch Cache Daemon
 #
@@ -49,16 +49,16 @@ prog=nscd
 start () {
     [ -d /var/run/nscd ] || mkdir /var/run/nscd
     [ -d /var/db/nscd ] || mkdir /var/db/nscd
-    echo -n $"Starting $prog: "
+    printf "Starting $prog: "
     daemon /usr/sbin/nscd
     RETVAL=$?
-    echo
+    printf "\n"
     [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
     return $RETVAL
 }
 
 stop () {
-    echo -n $"Stopping $prog: "
+    printf "Stopping $prog: "
     /usr/sbin/nscd -K
     RETVAL=$?
     if [ $RETVAL -eq 0 ]; then
@@ -67,11 +67,11 @@ stop () {
 	# a non-privileged user
 	rm -f /var/run/nscd/nscd.pid
 	rm -f /var/run/nscd/socket
-       	success $"$prog shutdown"
+	success "$prog shutdown"
     else
-       	failure $"$prog shutdown"
+	failure "$prog shutdown"
     fi
-    echo
+    printf "\n"
     return $RETVAL
 }
 
@@ -103,13 +103,13 @@ case "$1" in
 	RETVAL=$?
 	;;
     force-reload | reload)
-    	echo -n $"Reloading $prog: "
+	printf "Reloading $prog: "
 	killproc /usr/sbin/nscd -HUP
 	RETVAL=$?
-	echo
+	printf "\n"
 	;;
     *)
-	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
+	printf "Usage: $0 {start|stop|status|restart|reload|condrestart}\n"
 	RETVAL=1
 	;;
 esac
-- 
2.34.1

[PATCH v2 2/2] sysdeps/gnu/configure.ac: Set libc_cv_rootsbindir only if its empty

[Khem Raj]

This ensures that it can be set in build environment

Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
v2: Improve setting Default variable value for libc_cv_rootsbindir

 sysdeps/gnu/configure    | 2 +-
 sysdeps/gnu/configure.ac | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sysdeps/gnu/configure b/sysdeps/gnu/configure
index c15d1087e8..d30d6e37ae 100644
--- a/sysdeps/gnu/configure
+++ b/sysdeps/gnu/configure
@@ -32,6 +32,6 @@ case "$prefix" in
   else
     libc_cv_localstatedir=$localstatedir
    fi
-  libc_cv_rootsbindir=/sbin
+  libc_cv_rootsbindir=${libc_cv_rootsbindir:=/sbin}
   ;;
 esac
diff --git a/sysdeps/gnu/configure.ac b/sysdeps/gnu/configure.ac
index 634fe4de2a..492112e0fd 100644
--- a/sysdeps/gnu/configure.ac
+++ b/sysdeps/gnu/configure.ac
@@ -21,6 +21,6 @@ case "$prefix" in
   else
     libc_cv_localstatedir=$localstatedir
    fi
-  libc_cv_rootsbindir=/sbin
+  libc_cv_rootsbindir=${libc_cv_rootsbindir:=/sbin}
   ;;
 esac
-- 
2.34.1

Re: [PATCH v2 1/2] Replace echo with printf builtin in nscd init script

[Khem Raj]

Hi Florian

I replaced echo with printf
Looking for your feedback


On Thu, Dec 9, 2021 at 12:36 PM Khem Raj <raj.khem@gmail.com> wrote:
>
> The nscd init script calls for #! /bin/bash interpreter
> since it uses bash specific extentions namely (translated strings)
> and echo -n command, replace echo with printf and
> switch the shell interpreter to #!/bin/sh.
>
> Signed-off-by: Ross Burton <ross.burton@arm.com>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> v2: Replace echo with printf
>     Try to improve commit msg
>
>  nscd/nscd.init | 20 ++++++++++----------
>  1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/nscd/nscd.init b/nscd/nscd.init
> index a882da7d8b..857b541381 100644
> --- a/nscd/nscd.init
> +++ b/nscd/nscd.init
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/bin/sh
>  #
>  # nscd:                Starts the Name Switch Cache Daemon
>  #
> @@ -49,16 +49,16 @@ prog=nscd
>  start () {
>      [ -d /var/run/nscd ] || mkdir /var/run/nscd
>      [ -d /var/db/nscd ] || mkdir /var/db/nscd
> -    echo -n $"Starting $prog: "
> +    printf "Starting $prog: "
>      daemon /usr/sbin/nscd
>      RETVAL=$?
> -    echo
> +    printf "\n"
>      [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
>      return $RETVAL
>  }
>
>  stop () {
> -    echo -n $"Stopping $prog: "
> +    printf "Stopping $prog: "
>      /usr/sbin/nscd -K
>      RETVAL=$?
>      if [ $RETVAL -eq 0 ]; then
> @@ -67,11 +67,11 @@ stop () {
>         # a non-privileged user
>         rm -f /var/run/nscd/nscd.pid
>         rm -f /var/run/nscd/socket
> -               success $"$prog shutdown"
> +       success "$prog shutdown"
>      else
> -               failure $"$prog shutdown"
> +       failure "$prog shutdown"
>      fi
> -    echo
> +    printf "\n"
>      return $RETVAL
>  }
>
> @@ -103,13 +103,13 @@ case "$1" in
>         RETVAL=$?
>         ;;
>      force-reload | reload)
> -       echo -n $"Reloading $prog: "
> +       printf "Reloading $prog: "
>         killproc /usr/sbin/nscd -HUP
>         RETVAL=$?
> -       echo
> +       printf "\n"
>         ;;
>      *)
> -       echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
> +       printf "Usage: $0 {start|stop|status|restart|reload|condrestart}\n"
>         RETVAL=1
>         ;;
>  esac
> --
> 2.34.1
>