commit dmraid for openSUSE:Factory
Hello community, here is the log from the commit of package dmraid for openSUSE:Factory checked in at 2012-11-30 12:20:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dmraid (Old) and /work/SRC/openSUSE:Factory/.dmraid.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dmraid", Maintainer is "NFBrown@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/dmraid/dmraid.changes 2012-07-10 13:40:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dmraid.new/dmraid.changes 2012-11-30 12:20:57.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 28 12:07:36 UTC 2012 - rmilasan@suse.com + +- Move lock file to /run/lock so it wont interfere with systemd. + +------------------------------------------------------------------- New: ---- dmraid-move-var-lock-to-run-lock.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dmraid.spec ++++++ --- /var/tmp/diff_new_pack.FO4WEb/_old 2012-11-30 12:20:59.000000000 +0100 +++ /var/tmp/diff_new_pack.FO4WEb/_new 2012-11-30 12:20:59.000000000 +0100 @@ -16,13 +16,13 @@ # - Name: dmraid BuildRequires: autoconf BuildRequires: automake BuildRequires: device-mapper-devel BuildRequires: libselinux-devel BuildRequires: zlib-devel +Requires: aaa_base Requires: kpartx Url: http://people.redhat.com/~heinzm/sw/dmraid/src/ Summary: A Device-Mapper Software RAID Support Tool @@ -43,6 +43,7 @@ Patch5: remove_trylock Patch6: rebuild.fix Patch7: ddf-erase +Patch8: dmraid-move-var-lock-to-run-lock.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %fillup_prereq @@ -81,6 +82,7 @@ %patch5 -p2 %patch6 -p1 %patch7 -p1 +%patch8 -p1 cp %{SOURCE3} . %build ++++++ boot.dmraid ++++++ --- /var/tmp/diff_new_pack.FO4WEb/_old 2012-11-30 12:20:59.000000000 +0100 +++ /var/tmp/diff_new_pack.FO4WEb/_new 2012-11-30 12:20:59.000000000 +0100 @@ -33,6 +33,9 @@ DMRAID_DEVICE_TIMEOUT=0 fi +# make sure /run/lock exists as /run is tmpfs +[ -d /run/lock ] || mkdir -p /run/lock >/dev/null 2>&1 + rc_reset case "$1" in ++++++ dmraid-move-var-lock-to-run-lock.patch ++++++ 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. */ ++++++ mkinitrd-boot.sh ++++++ --- /var/tmp/diff_new_pack.FO4WEb/_old 2012-11-30 12:20:59.000000000 +0100 +++ /var/tmp/diff_new_pack.FO4WEb/_new 2012-11-30 12:20:59.000000000 +0100 @@ -16,6 +16,7 @@ ## root_dmraid=1 use device mapper raid ## +[ -d /run/lock ] || mkdir -p /run/lock >/dev/null 2>&1 /sbin/dmraid -a y -p wait_for_events -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de