diff options
Diffstat (limited to 'meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch')
| -rw-r--r-- | meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch | 83 |
1 files changed, 40 insertions, 43 deletions
diff --git a/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch b/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch index e86ab25e62..5b55111dc6 100644 --- a/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch +++ b/meta-oe/recipes-support/lvm2/files/0001-Avoid-bashisms-in-init-scripts.patch | |||
| @@ -17,17 +17,17 @@ Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> | |||
| 17 | scripts/lvm2_monitoring_init_rhel4 | 4 ++-- | 17 | scripts/lvm2_monitoring_init_rhel4 | 4 ++-- |
| 18 | 8 files changed, 17 insertions(+), 17 deletions(-) | 18 | 8 files changed, 17 insertions(+), 17 deletions(-) |
| 19 | 19 | ||
| 20 | diff --git a/scripts/blk_availability_init_red_hat.in b/scripts/blk_availability_init_red_hat.in | 20 | Index: LVM2.2.02.177/scripts/blk_availability_init_red_hat.in |
| 21 | index a84ffe7..6b855b7 100644 | 21 | =================================================================== |
| 22 | --- a/scripts/blk_availability_init_red_hat.in | 22 | --- LVM2.2.02.177.orig/scripts/blk_availability_init_red_hat.in |
| 23 | +++ b/scripts/blk_availability_init_red_hat.in | 23 | +++ LVM2.2.02.177/scripts/blk_availability_init_red_hat.in |
| 24 | @@ -1,4 +1,4 @@ | 24 | @@ -1,4 +1,4 @@ |
| 25 | -#!/bin/bash | 25 | -#!/bin/bash |
| 26 | +#!/bin/sh | 26 | +#!/bin/sh |
| 27 | # | 27 | # |
| 28 | # Copyright (C) 2012 Red Hat, Inc. All rights reserved. | 28 | # Copyright (C) 2012-2017 Red Hat, Inc. All rights reserved. |
| 29 | # | 29 | # |
| 30 | @@ -53,6 +53,6 @@ case "$1" in | 30 | @@ -51,6 +51,6 @@ case "$1" in |
| 31 | status) | 31 | status) |
| 32 | ;; | 32 | ;; |
| 33 | *) | 33 | *) |
| @@ -35,10 +35,10 @@ index a84ffe7..6b855b7 100644 | |||
| 35 | + echo "Usage: $0 {start|stop|status}" | 35 | + echo "Usage: $0 {start|stop|status}" |
| 36 | ;; | 36 | ;; |
| 37 | esac | 37 | esac |
| 38 | diff --git a/scripts/clvmd_init_red_hat.in b/scripts/clvmd_init_red_hat.in | 38 | Index: LVM2.2.02.177/scripts/clvmd_init_red_hat.in |
| 39 | index d7f3392..abc8011 100644 | 39 | =================================================================== |
| 40 | --- a/scripts/clvmd_init_red_hat.in | 40 | --- LVM2.2.02.177.orig/scripts/clvmd_init_red_hat.in |
| 41 | +++ b/scripts/clvmd_init_red_hat.in | 41 | +++ LVM2.2.02.177/scripts/clvmd_init_red_hat.in |
| 42 | @@ -1,4 +1,4 @@ | 42 | @@ -1,4 +1,4 @@ |
| 43 | -#!/bin/bash | 43 | -#!/bin/bash |
| 44 | +#!/bin/sh | 44 | +#!/bin/sh |
| @@ -63,17 +63,17 @@ index d7f3392..abc8011 100644 | |||
| 63 | rtrn=2 | 63 | rtrn=2 |
| 64 | ;; | 64 | ;; |
| 65 | esac | 65 | esac |
| 66 | diff --git a/scripts/cmirrord_init_red_hat.in b/scripts/cmirrord_init_red_hat.in | 66 | Index: LVM2.2.02.177/scripts/cmirrord_init_red_hat.in |
| 67 | index d4b7e37..d442cbc 100755 | 67 | =================================================================== |
| 68 | --- a/scripts/cmirrord_init_red_hat.in | 68 | --- LVM2.2.02.177.orig/scripts/cmirrord_init_red_hat.in |
| 69 | +++ b/scripts/cmirrord_init_red_hat.in | 69 | +++ LVM2.2.02.177/scripts/cmirrord_init_red_hat.in |
| 70 | @@ -1,4 +1,4 @@ | 70 | @@ -1,4 +1,4 @@ |
| 71 | -#!/bin/bash | 71 | -#!/bin/bash |
| 72 | +#!/bin/sh | 72 | +#!/bin/sh |
| 73 | # | 73 | # |
| 74 | # chkconfig: - 22 78 | 74 | # chkconfig: - 22 78 |
| 75 | # description: Starts and stops cmirrord | 75 | # description: Starts and stops cmirrord |
| 76 | @@ -101,7 +101,7 @@ case "$1" in | 76 | @@ -103,7 +103,7 @@ case "$1" in |
| 77 | ;; | 77 | ;; |
| 78 | 78 | ||
| 79 | *) | 79 | *) |
| @@ -82,15 +82,15 @@ index d4b7e37..d442cbc 100755 | |||
| 82 | ;; | 82 | ;; |
| 83 | esac | 83 | esac |
| 84 | 84 | ||
| 85 | diff --git a/scripts/lvm2_cluster_activation_red_hat.sh.in b/scripts/lvm2_cluster_activation_red_hat.sh.in | 85 | Index: LVM2.2.02.177/scripts/lvm2_cluster_activation_red_hat.sh.in |
| 86 | index abea026..d8cba2e 100644 | 86 | =================================================================== |
| 87 | --- a/scripts/lvm2_cluster_activation_red_hat.sh.in | 87 | --- LVM2.2.02.177.orig/scripts/lvm2_cluster_activation_red_hat.sh.in |
| 88 | +++ b/scripts/lvm2_cluster_activation_red_hat.sh.in | 88 | +++ LVM2.2.02.177/scripts/lvm2_cluster_activation_red_hat.sh.in |
| 89 | @@ -1,4 +1,4 @@ | 89 | @@ -1,4 +1,4 @@ |
| 90 | -#!/bin/bash | 90 | -#!/bin/bash |
| 91 | +#!/bin/sh | 91 | +#!/bin/sh |
| 92 | 92 | ||
| 93 | sbindir=@sbindir@ | 93 | sbindir="@SBINDIR@" |
| 94 | 94 | ||
| 95 | @@ -54,7 +54,7 @@ case "$1" in | 95 | @@ -54,7 +54,7 @@ case "$1" in |
| 96 | rtrn=$? | 96 | rtrn=$? |
| @@ -101,17 +101,17 @@ index abea026..d8cba2e 100644 | |||
| 101 | rtrn=3 | 101 | rtrn=3 |
| 102 | ;; | 102 | ;; |
| 103 | esac | 103 | esac |
| 104 | diff --git a/scripts/lvm2_lvmetad_init_red_hat.in b/scripts/lvm2_lvmetad_init_red_hat.in | 104 | Index: LVM2.2.02.177/scripts/lvm2_lvmetad_init_red_hat.in |
| 105 | index b2f5d50..96269a9 100644 | 105 | =================================================================== |
| 106 | --- a/scripts/lvm2_lvmetad_init_red_hat.in | 106 | --- LVM2.2.02.177.orig/scripts/lvm2_lvmetad_init_red_hat.in |
| 107 | +++ b/scripts/lvm2_lvmetad_init_red_hat.in | 107 | +++ LVM2.2.02.177/scripts/lvm2_lvmetad_init_red_hat.in |
| 108 | @@ -1,4 +1,4 @@ | 108 | @@ -1,4 +1,4 @@ |
| 109 | -#!/bin/bash | 109 | -#!/bin/bash |
| 110 | +#!/bin/sh | 110 | +#!/bin/sh |
| 111 | # | 111 | # |
| 112 | # Copyright (C) 2012 Red Hat, Inc. All rights reserved. | 112 | # Copyright (C) 2012-2017 Red Hat, Inc. All rights reserved. |
| 113 | # | 113 | # |
| 114 | @@ -105,7 +105,7 @@ case "$1" in | 114 | @@ -103,7 +103,7 @@ case "$1" in |
| 115 | ;; | 115 | ;; |
| 116 | 116 | ||
| 117 | *) | 117 | *) |
| @@ -120,17 +120,17 @@ index b2f5d50..96269a9 100644 | |||
| 120 | ;; | 120 | ;; |
| 121 | esac | 121 | esac |
| 122 | 122 | ||
| 123 | diff --git a/scripts/lvm2_lvmpolld_init_red_hat.in b/scripts/lvm2_lvmpolld_init_red_hat.in | 123 | Index: LVM2.2.02.177/scripts/lvm2_lvmpolld_init_red_hat.in |
| 124 | index c521955..cdbaece 100644 | 124 | =================================================================== |
| 125 | --- a/scripts/lvm2_lvmpolld_init_red_hat.in | 125 | --- LVM2.2.02.177.orig/scripts/lvm2_lvmpolld_init_red_hat.in |
| 126 | +++ b/scripts/lvm2_lvmpolld_init_red_hat.in | 126 | +++ LVM2.2.02.177/scripts/lvm2_lvmpolld_init_red_hat.in |
| 127 | @@ -1,4 +1,4 @@ | 127 | @@ -1,4 +1,4 @@ |
| 128 | -#!/bin/bash | 128 | -#!/bin/bash |
| 129 | +#!/bin/sh | 129 | +#!/bin/sh |
| 130 | # | 130 | # |
| 131 | # Copyright (C) 2015 Red Hat, Inc. All rights reserved. | 131 | # Copyright (C) 2015 Red Hat, Inc. All rights reserved. |
| 132 | # | 132 | # |
| 133 | @@ -107,7 +107,7 @@ case "$1" in | 133 | @@ -105,7 +105,7 @@ case "$1" in |
| 134 | ;; | 134 | ;; |
| 135 | 135 | ||
| 136 | *) | 136 | *) |
| @@ -139,17 +139,17 @@ index c521955..cdbaece 100644 | |||
| 139 | ;; | 139 | ;; |
| 140 | esac | 140 | esac |
| 141 | 141 | ||
| 142 | diff --git a/scripts/lvm2_monitoring_init_red_hat.in b/scripts/lvm2_monitoring_init_red_hat.in | 142 | Index: LVM2.2.02.177/scripts/lvm2_monitoring_init_red_hat.in |
| 143 | index de7ff0d..9ff6bb7 100644 | 143 | =================================================================== |
| 144 | --- a/scripts/lvm2_monitoring_init_red_hat.in | 144 | --- LVM2.2.02.177.orig/scripts/lvm2_monitoring_init_red_hat.in |
| 145 | +++ b/scripts/lvm2_monitoring_init_red_hat.in | 145 | +++ LVM2.2.02.177/scripts/lvm2_monitoring_init_red_hat.in |
| 146 | @@ -1,4 +1,4 @@ | 146 | @@ -1,4 +1,4 @@ |
| 147 | -#!/bin/bash | 147 | -#!/bin/bash |
| 148 | +#!/bin/sh | 148 | +#!/bin/sh |
| 149 | # | 149 | # |
| 150 | # Copyright (C) 2007-2009 Red Hat, Inc. All rights reserved. | 150 | # Copyright (C) 2007-2009 Red Hat, Inc. All rights reserved. |
| 151 | # | 151 | # |
| 152 | @@ -128,7 +128,7 @@ case "$1" in | 152 | @@ -127,7 +127,7 @@ case "$1" in |
| 153 | ;; | 153 | ;; |
| 154 | 154 | ||
| 155 | *) | 155 | *) |
| @@ -158,10 +158,10 @@ index de7ff0d..9ff6bb7 100644 | |||
| 158 | ;; | 158 | ;; |
| 159 | esac | 159 | esac |
| 160 | 160 | ||
| 161 | diff --git a/scripts/lvm2_monitoring_init_rhel4 b/scripts/lvm2_monitoring_init_rhel4 | 161 | Index: LVM2.2.02.177/scripts/lvm2_monitoring_init_rhel4 |
| 162 | index 8eb06c5..2e8d0f7 100644 | 162 | =================================================================== |
| 163 | --- a/scripts/lvm2_monitoring_init_rhel4 | 163 | --- LVM2.2.02.177.orig/scripts/lvm2_monitoring_init_rhel4 |
| 164 | +++ b/scripts/lvm2_monitoring_init_rhel4 | 164 | +++ LVM2.2.02.177/scripts/lvm2_monitoring_init_rhel4 |
| 165 | @@ -1,4 +1,4 @@ | 165 | @@ -1,4 +1,4 @@ |
| 166 | -#!/bin/bash | 166 | -#!/bin/bash |
| 167 | +#!/bin/sh | 167 | +#!/bin/sh |
| @@ -177,6 +177,3 @@ index 8eb06c5..2e8d0f7 100644 | |||
| 177 | ;; | 177 | ;; |
| 178 | esac | 178 | esac |
| 179 | 179 | ||
| 180 | -- | ||
| 181 | 2.12.0 | ||
| 182 | |||
