rpms/mdadm/FC-4 Makefile, NONE, 1.1 mdadm-1.5.0-email.patch, NONE, 1.1 mdadm-1.9.0-s390-build.patch, NONE, 1.1 mdadm-1.9.0-static-make.patch, NONE, 1.1 mdadm.spec, NONE, 1.1 mdmonitor.init, NONE, 1.1 mdmpd.init, NONE, 1.1 sources, NONE, 1.1
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri May 13 15:07:18 UTC 2005
Author: dledford
Update of /cvs/dist/rpms/mdadm/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv32572
Added Files:
Makefile mdadm-1.5.0-email.patch mdadm-1.9.0-s390-build.patch
mdadm-1.9.0-static-make.patch mdadm.spec mdmonitor.init
mdmpd.init sources
Log Message:
Ininital FC-4 branch checkin plus make the FC4 package obsolete raidtools
***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'
mdadm-1.5.0-email.patch:
mdadm.conf-example | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE mdadm-1.5.0-email.patch ---
--- mdadm-1.5.0/mdadm.conf-example.email 2004-02-26 08:08:23.000000000 -0500
+++ mdadm-1.5.0/mdadm.conf-example 2004-02-26 08:08:43.000000000 -0500
@@ -53,5 +53,5 @@
# and "program" lines to that monitoring can be started using
# mdadm --follow --scan & echo $! > /var/run/mdadm
# If the lines are not found, mdadm will exit quietly
-#MAILADDR root at mydomain.tld
+MAILADDR root
#PROGRAM /usr/sbin/handle-mdadm-events
mdadm-1.9.0-s390-build.patch:
Makefile | 2 +-
mdmpd/mdctrl.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE mdadm-1.9.0-s390-build.patch ---
--- mdadm-1.9.0/mdmpd/mdctrl.c.s390 2005-03-09 15:47:52.000000000 -0500
+++ mdadm-1.9.0/mdmpd/mdctrl.c 2005-03-09 15:48:17.000000000 -0500
@@ -48,7 +48,7 @@
#endif
static char * revision = "mdctrl.c ($Revision: 1.5 $)";
-static char node_directory[] = "/var/run/mdmpd";
+char node_directory[] = "/var/run/mdmpd";
static char path[80];
static char *print_number(char *s, long number) {
--- mdadm-1.9.0/Makefile.s390 2005-02-03 19:45:23.000000000 -0500
+++ mdadm-1.9.0/Makefile 2005-03-09 15:41:26.000000000 -0500
@@ -39,7 +39,7 @@
CC = gcc
CXFLAGS = -ggdb
-CWFLAGS = -Wall -Werror -Wstrict-prototypes
+CWFLAGS = -Wall -Wstrict-prototypes
SYSCONFDIR = /etc
CONFFILE = $(SYSCONFDIR)/mdadm.conf
MAILCMD =/usr/sbin/sendmail -t
mdadm-1.9.0-static-make.patch:
Makefile | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletion(-)
--- NEW FILE mdadm-1.9.0-static-make.patch ---
Binary files mdadm-1.9.0/mdadm.static and mdadm-1.9.0/mdadm differ
--- mdadm-1.9.0/Makefile.static 2005-03-21 12:05:30.000000000 -0500
+++ mdadm-1.9.0/Makefile 2005-03-21 12:07:28.000000000 -0500
@@ -116,11 +116,17 @@
$(OBJS) : mdadm.h
install : mdadm mdadm.8 md.4 mdadm.conf.5
- $(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm
+ $(INSTALL) -D -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm
$(INSTALL) -D -m 644 mdadm.8 $(DESTDIR)$(MAN8DIR)/mdadm.8
$(INSTALL) -D -m 644 md.4 $(DESTDIR)$(MAN4DIR)/md.4
$(INSTALL) -D -m 644 mdadm.conf.5 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5
+install.mdadmstatic: mdadm.static
+ $(INSTALL) -D -m 755 mdadm.static $(DESTDIR)$(BINDIR)/mdadm.static
+
+install.mdassemble: mdassemble
+ $(INSTALL) -D -m 755 mdassemble $(DESTDIR)$(BINDIR)/mdassemble
+
clean :
rm -f mdadm $(OBJS) core *.man mdadm.tcc mdadm.uclibc mdadm.static *.orig *.porig *.rej *.alt \
mdassemble mdassemble.static mdassemble.uclibc mdassemble.klibc
--- NEW FILE mdadm.spec ---
Summary: mdadm controls Linux md devices (software RAID arrays)
Name: mdadm
Version: 1.9.0
Release: 4.fc4
Source: http://www.cse.unsw.edu.au/~neilb/source/mdadm/mdadm-%{version}.tgz
Source1: mdmonitor.init
Source2: mdmpd-0.4.tgz
Source3: mdmpd.init
Patch: mdadm-1.5.0-email.patch
Patch2: mdadm-1.9.0-s390-build.patch
Patch3: mdadm-1.9.0-static-make.patch
URL: http://www.cse.unsw.edu.au/~neilb/source/mdadm/
License: GPL
Group: System Environment/Base
BuildRoot: %{_tmppath}/%{name}-root
Obsoletes: mdctl,raidtools
Requires: smtpdaemon
%description
mdadm is used to create, manage, and monitor Linux MD (software RAID)
devices. As such, it provides similar functionality to the raidtools
package. However, mdadm is a single program, and it can perform
almost all functions without a configuration file, though a configuration
file can be used to help with some common tasks.
%prep
%setup -q -a 2
%patch -p1 -b .email
%patch2 -p1 -b .s390
%patch3 -p1 -b .static
%build
make CXFLAGS="$RPM_OPT_FLAGS" SYSCONFDIR="%{_sysconfdir}" mdadm mdadm.static mdassemble.static
make CXFLAGS="$RPM_OPT_FLAGS" SYSCONFDIR="%{_sysconfdir}" -C mdmpd mdmpd
%install
make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} BINDIR=/sbin install install.mdadmstatic install.mdassemble
make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} BINDIR=/sbin -C mdmpd install
install -D -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initrddir}/mdmonitor
install -D -m755 %{SOURCE3} $RPM_BUILD_ROOT/%{_initrddir}/mdmpd
mkdir -p -m 700 $RPM_BUILD_ROOT/var/run/mdmpd
mkdir -p -m 700 $RPM_BUILD_ROOT/var/run/mdadm
%clean
[ $RPM_BUILD_ROOT != / ] && rm -rf $RPM_BUILD_ROOT
%post
/sbin/chkconfig --add mdmonitor
/sbin/chkconfig --add mdmpd
%preun
if [ "$1" = 0 ]; then
service mdmonitor stop > /dev/null 2>&1 ||:
/sbin/chkconfig --del mdmonitor
if [ -e %{_initrddir}/mdmpd ]; then
service mdmpd stop > /dev/null 2>&1 ||:
/sbin/chkconfig --del mdmpd
fi
fi
%postun
if [ "$1" -ge "1" ]; then
service mdmonitor condrestart > /dev/null 2>&1
if [ -e %{_initrddir}/mdmpd ]; then
service mdmpd condrestart > /dev/null 2>&1
fi
fi
%files
%defattr(-,root,root)
%doc ANNOUNCE-* TODO ChangeLog mdadm.conf-example COPYING INSTALL misc/*
/sbin/*
%{_initrddir}/*
%{_mandir}/man*/md*
%attr(0700,root,root) %dir /var/run/mdmpd
%attr(0700,root,root) %dir /var/run/mdadm
%changelog
* Wed Apr 27 2005 Jeremy Katz <katzj at redhat.com> - 1.9.0-3.fc4
- fix mdmonitor initscript (#144717)
* Mon Mar 21 2005 Doug Ledford <dledford at redhat.com> 1.9.0-2
- Build mdadm.static and mdassemble (static as well) to be used in initrd
images
* Wed Mar 09 2005 Doug Ledford <dledford at redhat.com> 1.9.0-1
- Initial upgrade to 1.9.0 and update of doc files
- Fix an s390 build error
* Mon Oct 04 2004 Doug Ledford <dledford at redhat.com> 1.6.0-2
- Remove /etc/mdadm.conf from the file list. Anaconda will write one out
if it's needed.
* Fri Oct 01 2004 Doug Ledford <dledford at redhat.com> 1.6.0-1
- Update to newer upstream version
- Make mdmpd work on kernels that don't have the event interface patch
* Fri Jul 30 2004 Dan Walsh <dwalsh at redhat.com> 1.5.0-11
- Create a directory /var/run/mdadm to contain mdadm.pid
- This cleans up SELinux problem
* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Sat May 22 2004 Doug Ledford <dledford at redhat.com> - 1.5.0-9
- Fix Makefile and build method to satisfy bz #123769
- Add mdmpd man page, update mdmpd version to 0.3 - bz #117160
- Make sure mdadm --monitor closes all md device files so that md devices
can be stopped while mdadm is still running - bz #119532
* Thu May 20 2004 Jeremy Katz <katzj at redhat.com> - 1.5.0-8
- remove unneeded patch, can use --run instead
* Wed May 19 2004 Jeremy Katz <katzj at redhat.com> - 1.5.0-7
- add patch with reallyforce mode on creation to be used by anaconda
* Wed May 12 2004 Doug Ledford <dledford at redhat.com> 2.5.0-6
- Fix a bug in the %postun scriptlet related to downgrading to a version
of mdadm that doesn't include the mdmpd daemon.
* Fri May 07 2004 Doug Ledford <dledford at redhat.com> 1.5.0-5
- Disable service mdmpd by default to avoid [Failed] messages on
current 2.6 kernels. Possibly re-enable it by default once the
2.6 kernels have the md event interface.
* Thu Apr 22 2004 Doug Ledford <dledford at redhat.com> 1.5.0-4
- Update mdmonitor script to start daemon more cleanly
- Repackage mdmpd tarball to include gcc-3.4 changes and to make
mdmpd properly daemonize at startup instead of forking and leaving
the child attached to the terminal.
* Thu Mar 4 2004 Bill Nottingham <notting at redhat.com> 1.5.0-3
- ship /var/run/mpmpd (#117497)
* Thu Feb 26 2004 Doug Ledford <dledford at redhat.com> 1.5.0-2
- Add a default MAILADDR line to the mdadm.conf file installed by default
(Bugzilla #92447)
- Make it build with gcc-3.4
* Mon Feb 23 2004 Doug Ledford <dledford at redhat.com> 1.5.0-1
- Update to 1.5.0 (from Matthew J. Galgoci <mgalgoci at redhat.com>)
* Sun Nov 16 2003 Doug Ledford <dledford at redhat.com> 1.4.0-1
- fix problem with recovery thread sleeping in mdmpd
* Fri Nov 14 2003 Doug Ledford <dledford at redhat.com>
- sync upstream
- add mdmpd package into mdadm package
* Wed Sep 10 2003 Michael K. Johnson <johnsonm at redhat.com> 1.3.0-1
- sync upstream
* Tue Mar 11 2003 Michael K. Johnson <johnsonm at redhat.com> 1.1.0-1
- sync upstream
* Tue Jan 28 2003 Michael K. Johnson <johnsonm at redhat.com> 1.0.1-1
- update for rebuild
* Wed Dec 25 2002 Tim Powers <timp at redhat.com> 1.0.0-8
- fix references to %%install in the changelog so that it will build
* Fri Dec 13 2002 Elliot Lee <sopwith at redhat.com> 1.0.0-7
- Rebuild
* Fri Jul 12 2002 Michael K. Johnson <johnsonm at redhat.com>
- Changed RPM Group to System Environment/Base
* Wed May 15 2002 Michael K. Johnson <johnsonm at redhat.com>
- minor cleanups to the text, conditionalize rm -rf
- added mdmonitor init script
* Fri May 10 2002 <neilb at cse.unsw.edu.au>
- update to 1.0.0
- Set CXFLAGS instead of CFLAGS
* Sat Apr 6 2002 <neilb at cse.unsw.edu.au>
- change %%install to use "make install"
* Fri Mar 15 2002 <gleblanc at localhost.localdomain>
- beautification
- made mdadm.conf non-replaceable config
- renamed Copyright to License in the header
- added missing license file
- used macros for file paths
* Fri Mar 15 2002 Luca Berra <bluca at comedia.it>
- Added Obsoletes: mdctl
- missingok for configfile
* Wed Mar 12 2002 NeilBrown <neilb at cse.unsw.edu.au>
- Add md.4 and mdadm.conf.5 man pages
* Fri Mar 08 2002 Chris Siebenmann <cks at cquest.utoronto.ca>
- builds properly as non-root.
* Fri Mar 08 2002 Derek Vadala <derek at cynicism.com>
- updated for 0.7, fixed /usr/share/doc and added manpage
* Tue Aug 07 2001 Danilo Godec <danci at agenda.si>
- initial RPM build
--- NEW FILE mdmonitor.init ---
#!/bin/bash
#
# mdmonitor This starts, stops, and reloads the mdadm-based
# software RAID monitoring and management facility
#
# chkconfig: 2345 15 85
# description: software RAID monitoring and management
# config: /etc/mdadm.conf
#
# Copyright 2002 Red Hat, Inc.
PATH=/sbin:/usr/sbin:$PATH
RETVAL=0
prog=mdmonitor
# Source function library.
. /etc/rc.d/init.d/functions
# Make sure configuration file exists and has information we can use
# MAILADDR or PROGRAM or both must be set in order to run mdadm --monitor
[ -f /etc/mdadm.conf ] || exit 0
grep '^\(MAILADDR\|PROGRAM\) .' /etc/mdadm.conf >/dev/null 2>&1 || exit 0
usage ()
{
echo "Usage: service $prog {start|stop|status|restart|condrestart}"
RETVAL=1
}
start ()
{
ulimit -S -c 0 >/dev/null 2>&1
echo -n $"Starting $prog: "
daemon --check mdadm --user=root \
"/bin/bash -c \"mdadm --monitor --scan -f > /var/run/mdadm/mdadm.pid\""
# hack: wait for mdadm to die, assume success if it doesn't die quickly
usleep 100000
if [ -s /var/run/mdadm/mdadm.pid -a -d /proc/$(cat /var/run/mdadm/mdadm.pid) ] ; then
success $"mdadm"
RETVAL=0
touch /var/lock/subsys/$prog
else
failure $"mdadm"
rm -f /var/run/mdadm/mdadm.pid
rm -f /var/lock/subsys/$prog
RETVAL=1
fi
echo
}
stop ()
{
echo -n "Killing $prog: "
killproc mdadm
echo
rm -f /var/run/mdadm/mdadm.pid
rm -f /var/lock/subsys/$prog
}
restart ()
{
stop
start
}
condrestart ()
{
[ -e /var/lock/subsys/$prog ] && restart
}
case "$1" in
start) start ;;
stop) stop ;;
status) status mdadm ;;
restart|reload) restart ;;
condrestart) condrestart ;;
*) usage ;;
esac
exit $RETVAL
--- NEW FILE mdmpd.init ---
#!/bin/bash
#
# mdmdp This starts, stops, and reloads the mdmpd-based
# multipath device monitoring and management facility
#
# chkconfig: - 15 85
# description: multipath device monitoring and management
#
# Copyright 2002 Red Hat, Inc.
PATH=/sbin:/usr/sbin:$PATH
RETVAL=0
prog=mdmpd
# Source function library.
. /etc/rc.d/init.d/functions
# Make sure configuration file exists and has information we can use
# MAILADDR or PROGRAM or both must be set in order to run mdadm --monitor
#[ -f /etc/mdadm.conf ] || exit 0
#grep '^\(MAILADDR\|PROGRAM\) .' /etc/mdadm.conf >/dev/null 2>&1 || exit 0
usage ()
{
echo "Usage: service $prog {start|stop|status|restart|condrestart}"
RETVAL=1
}
start ()
{
ulimit -S -c 0 >/dev/null 2>&1
# clean up in case we went down unexpectedly
rm -f /var/run/$prog/*
echo -n $"Starting $prog: "
daemon mdmpd
# hack: wait for mdadm to die, assume success if it doesn't die quickly
usleep 100000
pid=`pidof -o $$ -o $PPID -o %PPID -x $prog`
if [ -n "$pid" ] ; then
success $"mdmpd"
touch /var/lock/subsys/$prog
echo "$pid" > /var/run/$prog.pid
RETVAL=0
else
failure $"mdmpd"
RETVAL=1
fi
echo
}
stop ()
{
echo -n $"Stopping $prog: "
killproc $prog
echo
rm -f /var/run/$prog.pid
rm -f /var/lock/subsys/$prog
}
restart ()
{
stop
start
}
condrestart ()
{
[ -e /var/lock/subsys/$prog ] && restart
}
case "$1" in
start) start ;;
stop) stop ;;
status) status $prog ;;
restart|reload) restart ;;
condrestart) condrestart ;;
*) usage ;;
esac
exit $RETVAL
--- NEW FILE sources ---
d173fc81f2cc11cb84522fac63e876f1 mdmpd-0.4.tgz
4c5667761ba98890069127e54682e879 mdadm-1.9.0.tgz
More information about the fedora-cvs-commits
mailing list