Hello community, here is the log from the commit of package mdadm for openSUSE:Factory checked in at 2012-05-09 18:18:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mdadm (Old) and /work/SRC/openSUSE:Factory/.mdadm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mdadm", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/mdadm/mdadm.changes 2012-04-23 09:15:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mdadm.new/mdadm.changes 2012-05-09 18:32:05.000000000 +0200 @@ -1,0 +2,6 @@ +Wed May 9 01:22:11 UTC 2012 - [email protected] + +- New upstream version: 3.2.4. /run/mdadm is not + used for runtime files, not /var/run or /dev/.mdadm. + +------------------------------------------------------------------- Old: ---- auto-line.fix mdadm-3.2.2.tar.bz2 mdadm-3.2.2_git3b1dab1bdbda0 New: ---- mdadm-3.2.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mdadm.spec ++++++ --- /var/tmp/diff_new_pack.coLI2K/_old 2012-05-09 18:32:07.000000000 +0200 +++ /var/tmp/diff_new_pack.coLI2K/_new 2012-05-09 18:32:07.000000000 +0200 @@ -17,7 +17,7 @@ Name: mdadm -Version: 3.2.2 +Version: 3.2.4 Release: 0 BuildRequires: sgmltool PreReq: %fillup_prereq %insserv_prereq /sbin/mkinitrd @@ -34,8 +34,6 @@ Source4: boot.md Source5: mkinitrd-setup.sh Source6: mkinitrd-boot.sh -Patch0: mdadm-3.2.2_git3b1dab1bdbda0 -Patch1: auto-line.fix %description Mdadm is a program that can be used to control Linux md devices. It is @@ -44,8 +42,6 @@ %prep %setup -q -a1 -%patch0 -p1 -%patch1 -p1 %build make %{?_smp_mflags} CC="%__cc" CXFLAGS="$RPM_OPT_FLAGS -Wno-error" @@ -64,9 +60,8 @@ install -m 755 %{S:6} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-md.sh install -m 644 %{S:2} $RPM_BUILD_ROOT%{_var}/adm/fillup-templates/ ln -sf ../../etc/init.d/mdadmd $RPM_BUILD_ROOT/%{_sbindir}/rcmdadmd -rm -rf $RPM_BUILD_ROOT/var/run/mdadm -mkdir -p $RPM_BUILD_ROOT/var/run -ln -s mdadm $RPM_BUILD_ROOT/var/run/mdadm +rm -rf $RPM_BUILD_ROOT/run/mdadm +mkdir -p $RPM_BUILD_ROOT/run/mdadm install -d $RPM_BUILD_ROOT/lib/udev/rules.d install -m 644 udev-md-raid.rules $RPM_BUILD_ROOT/lib/udev/rules.d/64-md-raid.rules @@ -80,16 +75,9 @@ fi %{fillup_and_insserv -y boot.md} -mkdir -p /dev/.mdadm -# replace the /var/run/mdadm directory (installed by sle11/11.1) with -# a symlink pointing to /dev/.mdadm. Do not do this when /var/run/mdadm is -# not empty, let /etc/init.d/boot.md do it at the next reboot. -if test -e /var/run/mdadm -a ! /var/run/mdadm -ef /dev/.mdadm; then - if ! rmdir /var/run/mdadm 2>/dev/null; then - exit 0 - fi - ln -s /dev/.mdadm /var/run/mdadm -fi +# If /run/mdadm is already a symlink, this will fail and will have +# to wait for next boot. +mkdir -p /run/mdadm || true %postun %restart_on_update mdadmd @@ -120,7 +108,7 @@ %dir /lib/udev/devices %{_sbindir}/* %{_var}/adm/fillup-templates/sysconfig.mdadm -%ghost /var/run/mdadm +%ghost /run/mdadm %dir /lib/mkinitrd %dir /lib/mkinitrd/scripts /lib/mkinitrd/scripts/setup-md.sh ++++++ boot.md ++++++ --- /var/tmp/diff_new_pack.coLI2K/_old 2012-05-09 18:32:07.000000000 +0200 +++ /var/tmp/diff_new_pack.coLI2K/_new 2012-05-09 18:32:07.000000000 +0200 @@ -98,12 +98,7 @@ start) echo -n "Starting MD RAID " - # create the /var/run/mdadm symlink if needed - mkdir -p /dev/.mdadm - if test ! /dev/.mdadm -ef /var/run/mdadm; then - rm -rf /var/run/mdadm - ln -s /dev/.mdadm /var/run/mdadm - fi + mkdir -p /run/mdadm # restart mdmon (exits silently if there is nothing to monitor) /sbin/mdmon --all --takeover # Check for existence of needed config file and read it ++++++ mdadm-3.2.2.tar.bz2 -> mdadm-3.2.4.tar.bz2 ++++++ ++++ 13470 lines of diff (skipped) ++++++ mkinitrd-boot.sh ++++++ --- /var/tmp/diff_new_pack.coLI2K/_old 2012-05-09 18:32:08.000000000 +0200 +++ /var/tmp/diff_new_pack.coLI2K/_new 2012-05-09 18:32:08.000000000 +0200 @@ -18,11 +18,8 @@ # load the necessary module before we initialize the raid system load_modules -# put the mdmon socked and pid file to /dev/.mdadm -rm -rf /var/run/mdadm -mkdir -p /var/run -ln -s /dev/.mdadm /var/run/mdadm -mkdir -p /dev/.mdadm +# Create dir for socket and pid files +mkdir -p /run/mdadm [ "$mduuid" ] && md_uuid="$mduuid" md_major=$(sed -ne 's/\s*\([0-9]\+\)\s*md$/\1/p' /proc/devices) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
