mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-16 04:17:25 +00:00
Markus Volk
cc4e9fbd82
devmapper update also updated lvm2. Thus build fails with: patching file daemons/lvmdbusd/utils.py Hunk #1 FAILED at 778. 1 out of 1 hunk FAILED -- rejects in file daemons/lvmdbusd/utils.py - Drop the submitted patch - Move PV to lvm2.inc to ensure we keep it in sync for libdevmapper and lvm2 - refresh patches Signed-off-by: Markus Volk <f_l_k@t-online.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
115 lines
3.1 KiB
Diff
115 lines
3.1 KiB
Diff
From 44695f332e206e1db43d50163e1bce0bedf75fb7 Mon Sep 17 00:00:00 2001
|
|
From: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
|
|
Date: Mon, 26 Nov 2018 14:53:09 +0800
|
|
Subject: [PATCH] Avoid bashisms in init scripts
|
|
|
|
Upstream-Status: Inappropriate
|
|
|
|
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
|
|
|
|
Rebase to 2.03.01
|
|
|
|
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
|
---
|
|
scripts/blk_availability_init_red_hat.in | 4 ++--
|
|
scripts/cmirrord_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 ++--
|
|
5 files changed, 10 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/scripts/blk_availability_init_red_hat.in b/scripts/blk_availability_init_red_hat.in
|
|
index 347c39574..b2e9cf932 100644
|
|
--- a/scripts/blk_availability_init_red_hat.in
|
|
+++ b/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
|
|
diff --git a/scripts/cmirrord_init_red_hat.in b/scripts/cmirrord_init_red_hat.in
|
|
index c82f8f547..a3a321d9c 100755
|
|
--- a/scripts/cmirrord_init_red_hat.in
|
|
+++ b/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
|
|
|
|
diff --git a/scripts/lvm2_lvmpolld_init_red_hat.in b/scripts/lvm2_lvmpolld_init_red_hat.in
|
|
index 176ff5dcb..825f6ad84 100644
|
|
--- a/scripts/lvm2_lvmpolld_init_red_hat.in
|
|
+++ b/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
|
|
|
|
diff --git a/scripts/lvm2_monitoring_init_red_hat.in b/scripts/lvm2_monitoring_init_red_hat.in
|
|
index 95e4125a0..dff89cd38 100644
|
|
--- a/scripts/lvm2_monitoring_init_red_hat.in
|
|
+++ b/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
|
|
|
|
diff --git a/scripts/lvm2_monitoring_init_rhel4 b/scripts/lvm2_monitoring_init_rhel4
|
|
index 8eb06c509..2e8d0f71e 100644
|
|
--- a/scripts/lvm2_monitoring_init_rhel4
|
|
+++ b/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
|
|
|