0019-Replace-echo-with-printf-builtin-in-nscd-init-script.patch 2.0 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879
  1. From 97a71e1dd07ba6721464150b03fd67823b6271e2 Mon Sep 17 00:00:00 2001
  2. From: Khem Raj <raj.khem@gmail.com>
  3. Date: Thu, 31 Dec 2015 14:33:02 -0800
  4. Subject: [PATCH] Replace echo with printf builtin in nscd init script
  5. The nscd init script calls for #! /bin/bash interpreter
  6. since it uses bash specific extentions namely (translated strings)
  7. and echo -n command, replace echo with printf and
  8. switch the shell interpreter to #!/bin/sh.
  9. Upstream-Status: Pending
  10. Signed-off-by: Ross Burton <ross.burton@arm.com>
  11. Signed-off-by: Khem Raj <raj.khem@gmail.com>
  12. ---
  13. nscd/nscd.init | 20 ++++++++++----------
  14. 1 file changed, 10 insertions(+), 10 deletions(-)
  15. diff --git a/nscd/nscd.init b/nscd/nscd.init
  16. index a882da7d8b..857b541381 100644
  17. --- a/nscd/nscd.init
  18. +++ b/nscd/nscd.init
  19. @@ -1,4 +1,4 @@
  20. -#!/bin/bash
  21. +#!/bin/sh
  22. #
  23. # nscd: Starts the Name Switch Cache Daemon
  24. #
  25. @@ -49,16 +49,16 @@ prog=nscd
  26. start () {
  27. [ -d /var/run/nscd ] || mkdir /var/run/nscd
  28. [ -d /var/db/nscd ] || mkdir /var/db/nscd
  29. - echo -n $"Starting $prog: "
  30. + printf "Starting $prog: "
  31. daemon /usr/sbin/nscd
  32. RETVAL=$?
  33. - echo
  34. + printf "\n"
  35. [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
  36. return $RETVAL
  37. }
  38. stop () {
  39. - echo -n $"Stopping $prog: "
  40. + printf "Stopping $prog: "
  41. /usr/sbin/nscd -K
  42. RETVAL=$?
  43. if [ $RETVAL -eq 0 ]; then
  44. @@ -67,11 +67,11 @@ stop () {
  45. # a non-privileged user
  46. rm -f /var/run/nscd/nscd.pid
  47. rm -f /var/run/nscd/socket
  48. - success $"$prog shutdown"
  49. + success "$prog shutdown"
  50. else
  51. - failure $"$prog shutdown"
  52. + failure "$prog shutdown"
  53. fi
  54. - echo
  55. + printf "\n"
  56. return $RETVAL
  57. }
  58. @@ -103,13 +103,13 @@ case "$1" in
  59. RETVAL=$?
  60. ;;
  61. force-reload | reload)
  62. - echo -n $"Reloading $prog: "
  63. + printf "Reloading $prog: "
  64. killproc /usr/sbin/nscd -HUP
  65. RETVAL=$?
  66. - echo
  67. + printf "\n"
  68. ;;
  69. *)
  70. - echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
  71. + printf "Usage: $0 {start|stop|status|restart|reload|condrestart}\n"
  72. RETVAL=1
  73. ;;
  74. esac