Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 1 | From ea66faf68c93735edb1f2691cd7364b8cab83fef Mon Sep 17 00:00:00 2001 |
| 2 | From: Peter Kjellerstedt <peter.kjellerstedt@axis.com> |
| 3 | Date: Mon, 26 Nov 2018 14:53:09 +0800 |
| 4 | Subject: [PATCH 1/3] Avoid bashisms in init scripts |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 5 | |
| 6 | Upstream-Status: Inappropriate |
| 7 | |
| 8 | Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 9 | |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 10 | Rebase to 2.03.01 |
| 11 | |
| 12 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 13 | --- |
| 14 | scripts/blk_availability_init_red_hat.in | 4 ++-- |
| 15 | scripts/cmirrord_init_red_hat.in | 4 ++-- |
| 16 | scripts/lvm2_lvmpolld_init_red_hat.in | 4 ++-- |
| 17 | scripts/lvm2_monitoring_init_red_hat.in | 4 ++-- |
| 18 | scripts/lvm2_monitoring_init_rhel4 | 4 ++-- |
| 19 | 5 files changed, 10 insertions(+), 10 deletions(-) |
| 20 | |
| 21 | diff --git a/scripts/blk_availability_init_red_hat.in b/scripts/blk_availability_init_red_hat.in |
| 22 | index 347c395..b2e9cf9 100644 |
| 23 | --- a/scripts/blk_availability_init_red_hat.in |
| 24 | +++ b/scripts/blk_availability_init_red_hat.in |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 25 | @@ -1,4 +1,4 @@ |
| 26 | -#!/bin/bash |
| 27 | +#!/bin/sh |
| 28 | # |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 29 | # Copyright (C) 2012-2017 Red Hat, Inc. All rights reserved. |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 30 | # |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 31 | @@ -51,6 +51,6 @@ case "$1" in |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 32 | status) |
| 33 | ;; |
| 34 | *) |
| 35 | - echo $"Usage: $0 {start|stop|status}" |
| 36 | + echo "Usage: $0 {start|stop|status}" |
| 37 | ;; |
| 38 | esac |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 39 | diff --git a/scripts/cmirrord_init_red_hat.in b/scripts/cmirrord_init_red_hat.in |
| 40 | index c82f8f5..a3a321d 100755 |
| 41 | --- a/scripts/cmirrord_init_red_hat.in |
| 42 | +++ b/scripts/cmirrord_init_red_hat.in |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 43 | @@ -1,4 +1,4 @@ |
| 44 | -#!/bin/bash |
| 45 | +#!/bin/sh |
| 46 | # |
| 47 | # chkconfig: - 22 78 |
| 48 | # description: Starts and stops cmirrord |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 49 | @@ -103,7 +103,7 @@ case "$1" in |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 50 | ;; |
| 51 | |
| 52 | *) |
| 53 | - echo $"Usage: $0 {start|stop|restart|status}" |
| 54 | + echo "Usage: $0 {start|stop|restart|status}" |
| 55 | ;; |
| 56 | esac |
| 57 | |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 58 | diff --git a/scripts/lvm2_lvmpolld_init_red_hat.in b/scripts/lvm2_lvmpolld_init_red_hat.in |
| 59 | index 176ff5d..825f6ad 100644 |
| 60 | --- a/scripts/lvm2_lvmpolld_init_red_hat.in |
| 61 | +++ b/scripts/lvm2_lvmpolld_init_red_hat.in |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 62 | @@ -1,4 +1,4 @@ |
| 63 | -#!/bin/bash |
| 64 | +#!/bin/sh |
| 65 | # |
| 66 | # Copyright (C) 2015 Red Hat, Inc. All rights reserved. |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 67 | # |
| 68 | @@ -105,7 +105,7 @@ case "$1" in |
| 69 | ;; |
| 70 | |
| 71 | *) |
| 72 | - echo $"Usage: $0 {start|stop|force-stop|restart|condrestart|try-restart|status}" |
| 73 | + echo "Usage: $0 {start|stop|force-stop|restart|condrestart|try-restart|status}" |
| 74 | ;; |
| 75 | esac |
| 76 | |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 77 | diff --git a/scripts/lvm2_monitoring_init_red_hat.in b/scripts/lvm2_monitoring_init_red_hat.in |
| 78 | index 95e4125..dff89cd 100644 |
| 79 | --- a/scripts/lvm2_monitoring_init_red_hat.in |
| 80 | +++ b/scripts/lvm2_monitoring_init_red_hat.in |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 81 | @@ -1,4 +1,4 @@ |
| 82 | -#!/bin/bash |
| 83 | +#!/bin/sh |
| 84 | # |
| 85 | # Copyright (C) 2007-2009 Red Hat, Inc. All rights reserved. |
| 86 | # |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 87 | @@ -127,7 +127,7 @@ case "$1" in |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 88 | ;; |
| 89 | |
| 90 | *) |
| 91 | - echo $"Usage: $0 {start|stop|restart|status|force-stop}" |
| 92 | + echo "Usage: $0 {start|stop|restart|status|force-stop}" |
| 93 | ;; |
| 94 | esac |
| 95 | |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 96 | diff --git a/scripts/lvm2_monitoring_init_rhel4 b/scripts/lvm2_monitoring_init_rhel4 |
| 97 | index 8eb06c5..2e8d0f7 100644 |
| 98 | --- a/scripts/lvm2_monitoring_init_rhel4 |
| 99 | +++ b/scripts/lvm2_monitoring_init_rhel4 |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 100 | @@ -1,4 +1,4 @@ |
| 101 | -#!/bin/bash |
| 102 | +#!/bin/sh |
| 103 | # |
| 104 | # Copyright (C) 2007 Red Hat, Inc. All rights reserved. |
| 105 | # |
| 106 | @@ -93,7 +93,7 @@ case "$1" in |
| 107 | ;; |
| 108 | |
| 109 | *) |
| 110 | - echo $"Usage: $0 {start|stop|restart|status|force-stop}" |
| 111 | + echo "Usage: $0 {start|stop|restart|status|force-stop}" |
| 112 | ;; |
| 113 | esac |
| 114 | |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 115 | -- |
| 116 | 2.7.4 |
| 117 | |