0002-scripts-CHANGE-use-su-only-for-effective-root.patch 2.3 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879
  1. From 71cc996faa5500b3bfd499ad0c436c8b96629ea7 Mon Sep 17 00:00:00 2001
  2. From: Michal Vasko <mvasko@cesnet.cz>
  3. Date: Wed, 10 Jun 2020 15:20:23 +0200
  4. Subject: [PATCH] scripts CHANGE use su only for effective root
  5. Fixes #645
  6. [patch taken from upstream:
  7. https://github.com/CESNET/netopeer2/commit/2161b333009c21ffc8501e5127b82e6f0570ca8e]
  8. Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
  9. ---
  10. scripts/merge_config.sh | 8 ++++++--
  11. scripts/merge_hostkey.sh | 11 ++++++++---
  12. scripts/setup.sh | 8 ++++++--
  13. 3 files changed, 20 insertions(+), 7 deletions(-)
  14. diff --git a/scripts/merge_config.sh b/scripts/merge_config.sh
  15. index dde0c75..4ad151c 100755
  16. --- a/scripts/merge_config.sh
  17. +++ b/scripts/merge_config.sh
  18. @@ -2,8 +2,12 @@
  19. set -e
  20. -# avoid problems with sudo path
  21. -SYSREPOCFG=`su -c "which sysrepocfg" $USER`
  22. +# avoid problems with sudo PATH
  23. +if [ `id -u` -eq 0 ]; then
  24. + SYSREPOCFG=`su -c 'which sysrepocfg' -l $USER`
  25. +else
  26. + SYSREPOCFG=`which sysrepocfg`
  27. +fi
  28. KS_KEY_NAME=genkey
  29. # check that there is no listen/Call Home configuration yet
  30. diff --git a/scripts/merge_hostkey.sh b/scripts/merge_hostkey.sh
  31. index 87947fa..a0677ee 100755
  32. --- a/scripts/merge_hostkey.sh
  33. +++ b/scripts/merge_hostkey.sh
  34. @@ -2,9 +2,14 @@
  35. set -e
  36. -# avoid problems with sudo path
  37. -SYSREPOCFG=`su -c "which sysrepocfg" $USER`
  38. -OPENSSL=`su -c "which openssl" $USER`
  39. +# avoid problems with sudo PATH
  40. +if [ `id -u` -eq 0 ]; then
  41. + SYSREPOCFG=`su -c 'which sysrepocfg' -l $USER`
  42. + OPENSSL=`su -c 'which openssl' -l $USER`
  43. +else
  44. + SYSREPOCFG=`which sysrepocfg`
  45. + OPENSSL=`which openssl`
  46. +fi
  47. # check that there is no SSH key with this name yet
  48. KEYSTORE_KEY=`$SYSREPOCFG -X -x "/ietf-keystore:keystore/asymmetric-keys/asymmetric-key[name='genkey']/name"`
  49. diff --git a/scripts/setup.sh b/scripts/setup.sh
  50. index 81abf63..8bf6825 100755
  51. --- a/scripts/setup.sh
  52. +++ b/scripts/setup.sh
  53. @@ -6,8 +6,12 @@ if [ -z "$NP2_MODULE_DIR" -o -z "$NP2_MODULE_PERMS" -o -z "$NP2_MODULE_OWNER" -o
  54. exit 1
  55. fi
  56. -# avoid problems with sudo path
  57. -SYSREPOCTL=`su -c "which sysrepoctl" $USER`
  58. +# avoid problems with sudo PATH
  59. +if [ `id -u` -eq 0 ]; then
  60. + SYSREPOCTL=`su -c 'which sysrepoctl' -l $USER`
  61. +else
  62. + SYSREPOCTL=`which sysrepoctl`
  63. +fi
  64. MODDIR=${DESTDIR}${NP2_MODULE_DIR}
  65. PERMS=${NP2_MODULE_PERMS}
  66. OWNER=${NP2_MODULE_OWNER}
  67. --
  68. 2.20.1