Hello community, here is the log from the commit of package mdadm for openSUSE:Factory checked in at Fri Mar 26 01:36:13 CET 2010. -------- --- mdadm/mdadm.changes 2010-01-15 17:41:56.000000000 +0100 +++ mdadm/mdadm.changes 2010-03-24 17:41:52.000000000 +0100 @@ -1,0 +2,34 @@ +Wed Mar 24 17:37:27 CET 2010 - mmarek@suse.cz + +- 64-md-raid.rules: Use absolute path to grep, otherwise udev will + only search in /lib/udev (bnc#590832). + +------------------------------------------------------------------- +Tue Mar 23 14:49:38 CET 2010 - mmarek@suse.cz + +- mkinitrd-*.sh: Assemble md arrays even if the root= or resume= + option doesn't directly refer to md (bnc#589676, bnc#586837, + bnc#583424). + +------------------------------------------------------------------- +Thu Mar 11 10:18:18 CET 2010 - mmarek@suse.cz + +- 64-md-raid.rules: Use blkid instead of vol_id. + +------------------------------------------------------------------- +Thu Mar 11 09:58:21 CET 2010 - mmarek@suse.cz + +- 64-md-raid.rules: Allow --incremental assembly if "AUTO -all" is + given in mdadm.conf (fate#307478). + +------------------------------------------------------------------- +Tue Mar 9 16:15:41 CET 2010 - mmarek@suse.cz + +- Install udev rules in /lib/udev/rules.d (fate#307478). + +------------------------------------------------------------------- +Mon Feb 22 15:14:03 CET 2010 - mmarek@suse.cz + +- mkinitrd-setup.sh: call mdadm --scan only if necessary + (bnc#581769). + calling whatdependson for head-i586 New: ---- 64-md-raid.rules ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mdadm.spec ++++++ --- /var/tmp/diff_new_pack.XJKtlX/_old 2010-03-26 01:27:59.000000000 +0100 +++ /var/tmp/diff_new_pack.XJKtlX/_new 2010-03-26 01:27:59.000000000 +0100 @@ -20,7 +20,7 @@ Name: mdadm Version: 3.0.3 -Release: 4 +Release: 5 BuildRequires: sgmltool PreReq: %fillup_prereq %insserv_prereq Obsoletes: raidtools @@ -37,6 +37,7 @@ Source4: boot.md Source5: mkinitrd-setup.sh Source6: mkinitrd-boot.sh +Source7: 64-md-raid.rules %description Mdadm is a program that can be used to control Linux md devices. It is @@ -73,8 +74,8 @@ rm -rf $RPM_BUILD_ROOT/var/run/mdadm mkdir -p $RPM_BUILD_ROOT/var/run ln -s mdadm $RPM_BUILD_ROOT/var/run/mdadm -# remove here, using the one in the udev package -rm -f $RPM_BUILD_ROOT/lib/udev/rules.d/64-md-raid.rules +install -d $RPM_BUILD_ROOT/lib/udev/rules.d +install -m 644 %_sourcedir/64-md-raid.rules $RPM_BUILD_ROOT/lib/udev/rules.d %post [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup @@ -117,5 +118,8 @@ %dir /lib/mkinitrd/scripts /lib/mkinitrd/scripts/setup-md.sh /lib/mkinitrd/scripts/boot-md.sh +%dir /lib/udev +%dir /lib/udev/rules.d +/lib/udev/rules.d/64-md-raid.rules %changelog ++++++ 64-md-raid.rules ++++++ # do not edit this file, it will be overwritten on update SUBSYSTEM!="block", GOTO="md_end" ACTION!="add|change", GOTO="md_end" # import data from a raid member and activate it ENV{ID_FS_TYPE}=="linux_raid_member", PROGRAM="/bin/grep -qs '^AUTO -all' /etc/mdadm.conf", IMPORT{program}="/sbin/mdadm --examine --export $tempnode", RUN+="/sbin/mdadm --incremental $env{DEVNAME}" # import data from a raid set KERNEL!="md*", GOTO="md_end" # container devices have a metadata version of e.g. 'external:ddf' and # never leave state 'inactive' ATTR{md/metadata_version}=="external:[A-Za-z]*", ATTR{md/array_state}=="inactive", GOTO="md_ignore_state" ATTR{md/array_state}=="|clear|inactive", GOTO="md_end" LABEL="md_ignore_state" IMPORT{program}="/sbin/mdadm --detail --export $tempnode" ENV{DEVTYPE}=="disk", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}", OPTIONS+="string_escape=replace" ENV{DEVTYPE}=="disk", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}" ENV{DEVTYPE}=="disk", ENV{MD_DEVNAME}=="?*", SYMLINK+="md/$env{MD_DEVNAME}" ENV{DEVTYPE}!="partition", GOTO="md_vol_id" IMPORT{program}="/sbin/mdadm --detail --export %r/$parent" ENV{DEVTYPE}=="partition", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}-part%n", OPTIONS+="string_escape=replace" ENV{DEVTYPE}=="partition", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}-part%n" ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[^0-9]", SYMLINK+="md/$env{MD_DEVNAME}%n" ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[0-9]", SYMLINK+="md/$env{MD_DEVNAME}p%n" LABEL="md_vol_id" IMPORT{program}="/sbin/blkid -o udev -p $tempnode" OPTIONS+="link_priority=100" ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}" ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}" LABEL="md_end" ++++++ mkinitrd-boot.sh ++++++ --- /var/tmp/diff_new_pack.XJKtlX/_old 2010-03-26 01:27:59.000000000 +0100 +++ /var/tmp/diff_new_pack.XJKtlX/_new 2010-03-26 01:27:59.000000000 +0100 @@ -42,6 +42,9 @@ { local dev=$1 mdconf container + if test -e "$dev"; then + return + fi case "$dev" in /dev/md[0-9]*p[0-9]*) dev=${dev%p[0-9]*} @@ -84,5 +87,8 @@ if [ -n "$md_dev" ] ; then md_assemble "$md_dev" fi + for dev in $md_devs; do + md_assemble "$dev" + done wait_for_events fi ++++++ mkinitrd-setup.sh ++++++ --- /var/tmp/diff_new_pack.XJKtlX/_old 2010-03-26 01:27:59.000000000 +0100 +++ /var/tmp/diff_new_pack.XJKtlX/_new 2010-03-26 01:27:59.000000000 +0100 @@ -6,7 +6,7 @@ # Full mdadm.conf generated by mdadm. # Contains all created MD RAIDs -mdadm_conf=$(mdadm --examine --brief --scan) +mdadm_conf= cont_list= md_devs= @@ -64,7 +64,10 @@ mdconf="$(mdadm -Db "$container")\\n$mdconf" ;; [0-9a-f]*[0-9a-f]) - mdconf="$(mdadm -Ebs | grep "UUID=$container")\\n$mdconf" + if test -z "$mdadm_conf"; then + mdadm_conf=$(mdadm --examine --brief --scan) + fi + mdconf="$(echo "$mdadm_conf" | grep "UUID=$container")\\n$mdconf" ;; *) echo "unrecognized container for $md_dev: $container" @@ -84,6 +87,10 @@ eval echo -e \"\$md_conf_$md\" >> $tmp_mnt/etc/mdadm.conf done fi +# Remember which arrays are needed for the root or swap device and assemble +# them all during boot. The root= or resume= option might not directly refer to +# the array. +md_devs=$(printf '/dev/%s ' $md_devs) save_var need_mdadm -save_var root_md +save_var md_devs ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org