Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (ccc700123d49ca188fd85de99d2694765e68b1df)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (ccc700123d49ca188fd85de99d2694765e68b1df)
  • Date: Sun, 28 Mar 2010 08:10:30 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

disk/mdadm/DETAILS | 1 +
disk/mdadm/HISTORY | 5 +++++
disk/mdadm/PRE_BUILD | 4 ++++
disk/mdadm/udev.patch | 39 +++++++++++++++++++++++++++++++++++++++
4 files changed, 49 insertions(+)

New commits:
commit ccc700123d49ca188fd85de99d2694765e68b1df
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mdadm: fixed udev hang

diff --git a/disk/mdadm/DETAILS b/disk/mdadm/DETAILS
index a9b5d0a..8061e07 100755
--- a/disk/mdadm/DETAILS
+++ b/disk/mdadm/DETAILS
@@ -1,5 +1,6 @@
SPELL=mdadm
VERSION=3.1.2
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/disk/mdadm/HISTORY b/disk/mdadm/HISTORY
index 7a61567..08ad15f 100644
--- a/disk/mdadm/HISTORY
+++ b/disk/mdadm/HISTORY
@@ -1,3 +1,8 @@
+2010-03-28 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * udev.patch: added, fixed udev hang with new version
+ * PRE_BUILD: apply the patch
+
2010-03-26 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.1.2

diff --git a/disk/mdadm/PRE_BUILD b/disk/mdadm/PRE_BUILD
new file mode 100755
index 0000000..9b5c001
--- /dev/null
+++ b/disk/mdadm/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/udev.patch"
diff --git a/disk/mdadm/udev.patch b/disk/mdadm/udev.patch
new file mode 100644
index 0000000..b005eac
--- /dev/null
+++ b/disk/mdadm/udev.patch
@@ -0,0 +1,39 @@
+--- Makefile.orig 2010-03-18 23:52:23.000000000 +0100
++++ Makefile 2010-03-18 23:52:23.000000000 +0100
+@@ -62,7 +62,7 @@
+ # from early boot to late boot.
+ # If you don't have /lib/init/rw you might want to use /dev/.something
+ # e.g. make ALT_RUN=/dev/.mdadm
+-ALT_RUN = /lib/init/rw
++ALT_RUN = /dev/md
+ VAR_RUN = /var/run
+ ALTFLAGS = -DALT_RUN=\"$(ALT_RUN)\"
+ VARFLAGS = -DVAR_RUN=\"$(VAR_RUN)\"
+--- mapfile.c.orig
++++ mapfile.c
+@@ -29,7 +29,7 @@
+ */
+
+ /* /var/run/mdadm.map is used to track arrays being created in --incremental
+- * more. It particularly allows lookup from UUID to array device, but
++ * mode. It particularly allows lookup from UUID to array device, but
+ * also allows the array device name to be easily found.
+ *
+ * The map file is line based with space separated fields. The fields are:
+@@ -64,6 +64,16 @@ char *mapsmode[3] = { "r", "w", "w"};
+ FILE *open_map(int modenum, int *choice)
+ {
+ int i;
++ struct stat sbuf;
++
++ /* Special case...if ALT_RUN is selected to be /dev/md, then
++ * because we would normally create /dev/md ourselves in order to
++ * stuff array symlinks in there as needed, udev and friends
++ * expect us to create our own tree. So, do so.
++ */
++ if (strcmp(ALT_RUN, "/dev/md") == 0 && stat(ALT_RUN, &sbuf) != 0)
++ mkdir(ALT_RUN, 0755);
++
+ for (i = 0 ; i < 3 ; i++) {
+ int fd = open(mapname[i][modenum], mapmode[modenum], 0600);
+ if (fd >= 0) {



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (ccc700123d49ca188fd85de99d2694765e68b1df), Vlad Glagolev, 03/28/2010

Archive powered by MHonArc 2.6.24.

Top of Page