rpm/dmraid
SHA256
1
0
Fork 0
forked from pool/dmraid
Code Pull Requests Activity

Accepting request 143541 from Base:System

Browse Source 
- Move lock file to /run/lock so it wont interfere with systemd. (forwarded request 143482 from rmilasan)

OBS-URL: https://build.opensuse.org/request/show/143541
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dmraid?expand=0&rev=43
This commit is contained in:
Stephan Kulow 2012-11-30 11:20:55 +00:00 committed by Git OBS Bridge
commit 7beea34088
5 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
boot.dmraid
View File

@ -33,6 +33,9 @@ else
DMRAID_DEVICE_TIMEOUT=0 DMRAID_DEVICE_TIMEOUT=0
fi fi
# make sure /run/lock exists as /run is tmpfs
[ -d /run/lock ] || mkdir -p /run/lock >/dev/null 2>&1
rc_reset rc_reset
case "$1" in case "$1" in

13
dmraid-move-var-lock-to-run-lock.patch Normal file
View File

@ -0,0 +1,13 @@
Index: 1.0.0.rc16/lib/locking/locking.c
===================================================================
--- 1.0.0.rc16.orig/lib/locking/locking.c
+++ 1.0.0.rc16/lib/locking/locking.c
@@ -12,7 +12,7 @@
#include "internal.h"
/* File locking private data. */
-static const char *lock_file = "/var/lock/dmraid/.lock";
+static const char *lock_file = "/run/lock/dmraid/.lock";
static int lf = -1;
/* flock file. */

5
dmraid.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Nov 28 12:07:36 UTC 2012 - rmilasan@suse.com
- Move lock file to /run/lock so it wont interfere with systemd.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 9 09:03:57 UTC 2012 - cfarrell@suse.com Mon Jul 9 09:03:57 UTC 2012 - cfarrell@suse.com

4
dmraid.spec
View File

@ -16,13 +16,13 @@
# #
Name: dmraid Name: dmraid
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: device-mapper-devel BuildRequires: device-mapper-devel
BuildRequires: libselinux-devel BuildRequires: libselinux-devel
BuildRequires: zlib-devel BuildRequires: zlib-devel
Requires: aaa_base
Requires: kpartx Requires: kpartx
Url: http://people.redhat.com/~heinzm/sw/dmraid/src/ Url: http://people.redhat.com/~heinzm/sw/dmraid/src/
Summary: A Device-Mapper Software RAID Support Tool Summary: A Device-Mapper Software RAID Support Tool
@ -43,6 +43,7 @@ Patch4: handle_spaces
Patch5: remove_trylock Patch5: remove_trylock
Patch6: rebuild.fix Patch6: rebuild.fix
Patch7: ddf-erase Patch7: ddf-erase
Patch8: dmraid-move-var-lock-to-run-lock.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %fillup_prereq PreReq: %fillup_prereq
@ -81,6 +82,7 @@ Authors:
%patch5 -p2 %patch5 -p2
%patch6 -p1 %patch6 -p1
%patch7 -p1 %patch7 -p1
%patch8 -p1
cp %{SOURCE3} . cp %{SOURCE3} .
%build %build

1
mkinitrd-boot.sh
View File

@ -16,6 +16,7 @@
## root_dmraid=1 use device mapper raid ## root_dmraid=1 use device mapper raid
## ##
[ -d /run/lock ] || mkdir -p /run/lock >/dev/null 2>&1
/sbin/dmraid -a y -p /sbin/dmraid -a y -p
wait_for_events wait_for_events