mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-16 04:17:25 +00:00
Armin Kuster
40c0b16b72
used quilt to refresh Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
180 lines
5.1 KiB
Diff
180 lines
5.1 KiB
Diff
From 916ea0c70fd063ab7b81f16fd917a75dc02edf4f Mon Sep 17 00:00:00 2001
|
|
From: Peter Kjellerstedt <pkj@axis.com>
|
|
Date: Fri, 17 Mar 2017 03:18:28 +0100
|
|
Subject: [PATCH] Avoid bashisms in init scripts
|
|
|
|
Upstream-Status: Inappropriate
|
|
|
|
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
|
|
---
|
|
scripts/blk_availability_init_red_hat.in | 4 ++--
|
|
scripts/clvmd_init_red_hat.in | 6 +++---
|
|
scripts/cmirrord_init_red_hat.in | 4 ++--
|
|
scripts/lvm2_cluster_activation_red_hat.sh.in | 4 ++--
|
|
scripts/lvm2_lvmetad_init_red_hat.in | 4 ++--
|
|
scripts/lvm2_lvmpolld_init_red_hat.in | 4 ++--
|
|
scripts/lvm2_monitoring_init_red_hat.in | 4 ++--
|
|
scripts/lvm2_monitoring_init_rhel4 | 4 ++--
|
|
8 files changed, 17 insertions(+), 17 deletions(-)
|
|
|
|
Index: LVM2.2.02.177/scripts/blk_availability_init_red_hat.in
|
|
===================================================================
|
|
--- LVM2.2.02.177.orig/scripts/blk_availability_init_red_hat.in
|
|
+++ LVM2.2.02.177/scripts/blk_availability_init_red_hat.in
|
|
@@ -1,4 +1,4 @@
|
|
-#!/bin/bash
|
|
+#!/bin/sh
|
|
#
|
|
# Copyright (C) 2012-2017 Red Hat, Inc. All rights reserved.
|
|
#
|
|
@@ -51,6 +51,6 @@ case "$1" in
|
|
status)
|
|
;;
|
|
*)
|
|
- echo $"Usage: $0 {start|stop|status}"
|
|
+ echo "Usage: $0 {start|stop|status}"
|
|
;;
|
|
esac
|
|
Index: LVM2.2.02.177/scripts/clvmd_init_red_hat.in
|
|
===================================================================
|
|
--- LVM2.2.02.177.orig/scripts/clvmd_init_red_hat.in
|
|
+++ LVM2.2.02.177/scripts/clvmd_init_red_hat.in
|
|
@@ -1,4 +1,4 @@
|
|
-#!/bin/bash
|
|
+#!/bin/sh
|
|
#
|
|
# clvmd - Clustered LVM Daemon init script
|
|
#
|
|
@@ -161,7 +161,7 @@ restart() {
|
|
fi
|
|
}
|
|
|
|
-[ "$EUID" != "0" ] && {
|
|
+[ "$(id -u)" != "0" ] && {
|
|
echo "clvmd init script can only be executed as root user"
|
|
exit 4
|
|
}
|
|
@@ -206,7 +206,7 @@ case "$1" in
|
|
;;
|
|
|
|
*)
|
|
- echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
|
|
+ echo "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
|
|
rtrn=2
|
|
;;
|
|
esac
|
|
Index: LVM2.2.02.177/scripts/cmirrord_init_red_hat.in
|
|
===================================================================
|
|
--- LVM2.2.02.177.orig/scripts/cmirrord_init_red_hat.in
|
|
+++ LVM2.2.02.177/scripts/cmirrord_init_red_hat.in
|
|
@@ -1,4 +1,4 @@
|
|
-#!/bin/bash
|
|
+#!/bin/sh
|
|
#
|
|
# chkconfig: - 22 78
|
|
# description: Starts and stops cmirrord
|
|
@@ -103,7 +103,7 @@ case "$1" in
|
|
;;
|
|
|
|
*)
|
|
- echo $"Usage: $0 {start|stop|restart|status}"
|
|
+ echo "Usage: $0 {start|stop|restart|status}"
|
|
;;
|
|
esac
|
|
|
|
Index: LVM2.2.02.177/scripts/lvm2_cluster_activation_red_hat.sh.in
|
|
===================================================================
|
|
--- LVM2.2.02.177.orig/scripts/lvm2_cluster_activation_red_hat.sh.in
|
|
+++ LVM2.2.02.177/scripts/lvm2_cluster_activation_red_hat.sh.in
|
|
@@ -1,4 +1,4 @@
|
|
-#!/bin/bash
|
|
+#!/bin/sh
|
|
|
|
sbindir="@SBINDIR@"
|
|
|
|
@@ -54,7 +54,7 @@ case "$1" in
|
|
rtrn=$?
|
|
;;
|
|
*)
|
|
- echo $"Usage: $0 {activate|deactivate}"
|
|
+ echo "Usage: $0 {activate|deactivate}"
|
|
rtrn=3
|
|
;;
|
|
esac
|
|
Index: LVM2.2.02.177/scripts/lvm2_lvmetad_init_red_hat.in
|
|
===================================================================
|
|
--- LVM2.2.02.177.orig/scripts/lvm2_lvmetad_init_red_hat.in
|
|
+++ LVM2.2.02.177/scripts/lvm2_lvmetad_init_red_hat.in
|
|
@@ -1,4 +1,4 @@
|
|
-#!/bin/bash
|
|
+#!/bin/sh
|
|
#
|
|
# Copyright (C) 2012-2017 Red Hat, Inc. All rights reserved.
|
|
#
|
|
@@ -103,7 +103,7 @@ case "$1" in
|
|
;;
|
|
|
|
*)
|
|
- echo $"Usage: $0 {start|stop|force-stop|restart|condrestart|try-restart|status}"
|
|
+ echo "Usage: $0 {start|stop|force-stop|restart|condrestart|try-restart|status}"
|
|
;;
|
|
esac
|
|
|
|
Index: LVM2.2.02.177/scripts/lvm2_lvmpolld_init_red_hat.in
|
|
===================================================================
|
|
--- LVM2.2.02.177.orig/scripts/lvm2_lvmpolld_init_red_hat.in
|
|
+++ LVM2.2.02.177/scripts/lvm2_lvmpolld_init_red_hat.in
|
|
@@ -1,4 +1,4 @@
|
|
-#!/bin/bash
|
|
+#!/bin/sh
|
|
#
|
|
# Copyright (C) 2015 Red Hat, Inc. All rights reserved.
|
|
#
|
|
@@ -105,7 +105,7 @@ case "$1" in
|
|
;;
|
|
|
|
*)
|
|
- echo $"Usage: $0 {start|stop|force-stop|restart|condrestart|try-restart|status}"
|
|
+ echo "Usage: $0 {start|stop|force-stop|restart|condrestart|try-restart|status}"
|
|
;;
|
|
esac
|
|
|
|
Index: LVM2.2.02.177/scripts/lvm2_monitoring_init_red_hat.in
|
|
===================================================================
|
|
--- LVM2.2.02.177.orig/scripts/lvm2_monitoring_init_red_hat.in
|
|
+++ LVM2.2.02.177/scripts/lvm2_monitoring_init_red_hat.in
|
|
@@ -1,4 +1,4 @@
|
|
-#!/bin/bash
|
|
+#!/bin/sh
|
|
#
|
|
# Copyright (C) 2007-2009 Red Hat, Inc. All rights reserved.
|
|
#
|
|
@@ -127,7 +127,7 @@ case "$1" in
|
|
;;
|
|
|
|
*)
|
|
- echo $"Usage: $0 {start|stop|restart|status|force-stop}"
|
|
+ echo "Usage: $0 {start|stop|restart|status|force-stop}"
|
|
;;
|
|
esac
|
|
|
|
Index: LVM2.2.02.177/scripts/lvm2_monitoring_init_rhel4
|
|
===================================================================
|
|
--- LVM2.2.02.177.orig/scripts/lvm2_monitoring_init_rhel4
|
|
+++ LVM2.2.02.177/scripts/lvm2_monitoring_init_rhel4
|
|
@@ -1,4 +1,4 @@
|
|
-#!/bin/bash
|
|
+#!/bin/sh
|
|
#
|
|
# Copyright (C) 2007 Red Hat, Inc. All rights reserved.
|
|
#
|
|
@@ -93,7 +93,7 @@ case "$1" in
|
|
;;
|
|
|
|
*)
|
|
- echo $"Usage: $0 {start|stop|restart|status|force-stop}"
|
|
+ echo "Usage: $0 {start|stop|restart|status|force-stop}"
|
|
;;
|
|
esac
|
|
|