Accepting request 240873 from Base:System
Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/240873 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mdadm?expand=0&rev=93
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
3a3bf2f404
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jul 7 01:52:35 UTC 2014 - nfbrown@suse.com
|
||||||
|
|
||||||
|
- Remove mkinitrd scripts again. "libguestfs" now
|
||||||
|
includes them so "guestfs" does not need us to.
|
||||||
|
(bnc#883873)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Jun 26 03:08:15 UTC 2014 - nfbrown@suse.com
|
Thu Jun 26 03:08:15 UTC 2014 - nfbrown@suse.com
|
||||||
|
|
||||||
|
|||||||
@ -37,8 +37,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
|||||||
Source: https://www.kernel.org/pub/linux/utils/raid/mdadm/%{name}-%{version}.tar.xz
|
Source: https://www.kernel.org/pub/linux/utils/raid/mdadm/%{name}-%{version}.tar.xz
|
||||||
Source1: Software-RAID.HOWTO.tar.bz2
|
Source1: Software-RAID.HOWTO.tar.bz2
|
||||||
Source2: sysconfig.mdadm
|
Source2: sysconfig.mdadm
|
||||||
Source5: mkinitrd-setup.sh
|
|
||||||
Source6: mkinitrd-boot.sh
|
|
||||||
Source7: mdadm.cron
|
Source7: mdadm.cron
|
||||||
# PATCH-FIX-UPSTREAM 0001-Makefile-install-mdadm-grow-continue-.service.patch nfbrown@suse.de
|
# PATCH-FIX-UPSTREAM 0001-Makefile-install-mdadm-grow-continue-.service.patch nfbrown@suse.de
|
||||||
Patch1: 0001-Makefile-install-mdadm-grow-continue-.service.patch
|
Patch1: 0001-Makefile-install-mdadm-grow-continue-.service.patch
|
||||||
@ -69,9 +67,6 @@ make install install-systemd install-udev DESTDIR=%{buildroot} SYSTEMD_DIR=%{_un
|
|||||||
rm -rf %{buildroot}/lib/udev
|
rm -rf %{buildroot}/lib/udev
|
||||||
install -d %{buildroot}%{_var}/adm/fillup-templates
|
install -d %{buildroot}%{_var}/adm/fillup-templates
|
||||||
install -d %{buildroot}{%{_sbindir}
|
install -d %{buildroot}{%{_sbindir}
|
||||||
install -d %{buildroot}/lib/mkinitrd/scripts
|
|
||||||
install -m 755 %{S:5} %{buildroot}/lib/mkinitrd/scripts/setup-md.sh
|
|
||||||
install -m 755 %{S:6} %{buildroot}/lib/mkinitrd/scripts/boot-md.sh
|
|
||||||
install -d %{buildroot}/etc/cron.daily
|
install -d %{buildroot}/etc/cron.daily
|
||||||
install -m 755 %{S:7} %{buildroot}/etc/cron.daily/mdadm
|
install -m 755 %{S:7} %{buildroot}/etc/cron.daily/mdadm
|
||||||
install -m 644 %{S:2} %{buildroot}%{_var}/adm/fillup-templates/
|
install -m 644 %{S:2} %{buildroot}%{_var}/adm/fillup-templates/
|
||||||
@ -98,10 +93,6 @@ rm -rf %{buildroot}
|
|||||||
%doc %{_mandir}/man?/*
|
%doc %{_mandir}/man?/*
|
||||||
/sbin/*
|
/sbin/*
|
||||||
%{_var}/adm/fillup-templates/sysconfig.mdadm
|
%{_var}/adm/fillup-templates/sysconfig.mdadm
|
||||||
%dir /lib/mkinitrd
|
|
||||||
%dir /lib/mkinitrd/scripts
|
|
||||||
/lib/mkinitrd/scripts/setup-md.sh
|
|
||||||
/lib/mkinitrd/scripts/boot-md.sh
|
|
||||||
%{_udevdir}/rules.d/63-md-raid-arrays.rules
|
%{_udevdir}/rules.d/63-md-raid-arrays.rules
|
||||||
%{_udevdir}/rules.d/64-md-raid-assembly.rules
|
%{_udevdir}/rules.d/64-md-raid-assembly.rules
|
||||||
%dir /etc/cron.daily
|
%dir /etc/cron.daily
|
||||||
|
|||||||
@ -1,32 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
#%stage: boot
|
|
||||||
#%depends: start
|
|
||||||
#%programs: /sbin/mdadm /sbin/mdmon
|
|
||||||
#%modules: raid0 raid1 raid10 raid456
|
|
||||||
#%if: -n "$need_mdadm"
|
|
||||||
#
|
|
||||||
##### MD (Software-)Raid
|
|
||||||
##
|
|
||||||
## This only sets the 'start_ro' module parameter to ensure
|
|
||||||
## arrays don't start resync until after the first write.
|
|
||||||
## All array assembly is performed by udev -> "mdadm -I"
|
|
||||||
##
|
|
||||||
## Command line parameters
|
|
||||||
## -----------------------
|
|
||||||
##
|
|
||||||
## need_mdadm=1 use MD raid
|
|
||||||
##
|
|
||||||
|
|
||||||
# load the necessary module before we initialize the raid system
|
|
||||||
load_modules
|
|
||||||
|
|
||||||
#check_for_device uses $md_major
|
|
||||||
#we depend on 'start' to ensure /proc/devices exists
|
|
||||||
md_major=$(sed -ne 's/\s*\([0-9]\+\)\s*md$/\1/p' /proc/devices)
|
|
||||||
|
|
||||||
# Always start md devices read/only. They will get set to rw as soon
|
|
||||||
# as the first write occurs. This way we can guarantee that no
|
|
||||||
# restore occurs before resume.
|
|
||||||
if [ -f /sys/module/md_mod/parameters/start_ro ]; then
|
|
||||||
echo 1 > /sys/module/md_mod/parameters/start_ro
|
|
||||||
fi
|
|
||||||
@ -1,120 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
#
|
|
||||||
#%stage: softraid
|
|
||||||
#
|
|
||||||
mdblockdev=
|
|
||||||
|
|
||||||
# Full mdadm.conf generated by mdadm.
|
|
||||||
# Contains all created MD RAIDs
|
|
||||||
mdadm_conf=
|
|
||||||
|
|
||||||
cont_list=
|
|
||||||
md_devs=
|
|
||||||
|
|
||||||
declare -A md_conf
|
|
||||||
# blockdev contains real devices (/dev/X) for root, resume, journal, dumb
|
|
||||||
for bd in $blockdev ; do
|
|
||||||
is_part_dev=false
|
|
||||||
case $bd in
|
|
||||||
/dev/md[_0-9]*p[0-9]* )
|
|
||||||
# Partitionable MD RAID. This is partition on RAID. Get the RAID
|
|
||||||
bd=${bd%%p[0-9]*}
|
|
||||||
is_part_dev=true
|
|
||||||
;;
|
|
||||||
/dev/md[0-9_]*)
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
mdblockdev="$mdblockdev $bd"
|
|
||||||
continue
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
# Check if this device is already added (possible for partitionable).
|
|
||||||
md_dev=`mdadm -D --export $bd | sed -n -e 's/^MD_DEVNAME=//p'`
|
|
||||||
if [ -z "$md_dev" ]; then
|
|
||||||
md_dev=${bd##/dev/}
|
|
||||||
else
|
|
||||||
bd="/dev/md/$md_dev"
|
|
||||||
fi
|
|
||||||
dup_found=false
|
|
||||||
for dup in $md_devs; do
|
|
||||||
if [ x"$dup" = x"$md_dev" ]; then
|
|
||||||
dup_found=true
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if $dup_found; then
|
|
||||||
if ! $is_part_dev; then
|
|
||||||
echo "setup-md.sh: $md_dev found multiple times" >&2
|
|
||||||
fi
|
|
||||||
continue
|
|
||||||
fi
|
|
||||||
mdconf=$(mdadm -Db "$bd")
|
|
||||||
if test -z "$mdconf"; then
|
|
||||||
mdblockdev="$mdblockdev $bd"
|
|
||||||
continue
|
|
||||||
fi
|
|
||||||
md_tmpblockdev=$(mdadm -Dbv $bd | sed -n "1D;s/,/ /g;s/^ *devices=//p")
|
|
||||||
mdblockdev="$mdblockdev $md_tmpblockdev"
|
|
||||||
md_devs="$md_devs $md_dev"
|
|
||||||
container=$(echo "$mdconf" | sed -rn 's/.* container=([^ ]*) .*/\1/p')
|
|
||||||
for cnt in $cont_list; do
|
|
||||||
if [ x"$container" = x"$cnt" ]; then
|
|
||||||
container=
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
case "$container" in
|
|
||||||
"")
|
|
||||||
;;
|
|
||||||
/dev/*)
|
|
||||||
mdconf="$(mdadm -Db "$container")\\n$mdconf"
|
|
||||||
cont_list="$cont_list $container"
|
|
||||||
;;
|
|
||||||
[0-9a-f]*[0-9a-f])
|
|
||||||
if test -z "$mdadm_conf"; then
|
|
||||||
mdadm_conf=$(mdadm --examine --brief --scan)
|
|
||||||
fi
|
|
||||||
mdconf="$(echo "$mdadm_conf" | grep "UUID=$container")\\n$mdconf"
|
|
||||||
cont_list="$cont_list $container"
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo "unrecognized container for $md_dev: $container"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
# If /etc/mdadm.conf contains a different name for this
|
|
||||||
# array, then use that.
|
|
||||||
md_uuid=`echo $mdconf | sed -n -e 's/.* UUID=\([0-9a-f:]*\).*/\1/p'`
|
|
||||||
if [ -f /etc/mdadm.conf -a -n "$md_uuid" ]; then
|
|
||||||
md_devname=`sed -n -e 's,^ARRAY */dev/\([^ ]*\) .*[Uu][Uu][Ii][Dd]='$md_uuid'.*,\1,p' /etc/mdadm.conf`
|
|
||||||
if [ -n "$md_devname" ]; then
|
|
||||||
mdconf=`echo $mdconf | sed -e 's,^ARRAY /dev/\([^ ]*\),ARRAY /dev/'$md_devname','`
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
md_conf["$md_dev"]="$mdconf"
|
|
||||||
root_md=1
|
|
||||||
done
|
|
||||||
|
|
||||||
# Any 'md' device is replaced by it's component disks.
|
|
||||||
blockdev="$mdblockdev"
|
|
||||||
|
|
||||||
if [ -n "$root_md" ] ; then
|
|
||||||
need_mdadm=1
|
|
||||||
echo "AUTO -all" > $tmp_mnt/etc/mdadm.conf
|
|
||||||
for md in $md_devs; do
|
|
||||||
echo -e "${md_conf["$md"]}" >> $tmp_mnt/etc/mdadm.conf
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "x$need_mdadm" = "x1" ] ; then
|
|
||||||
for rule in \
|
|
||||||
63-md-raid-arrays.rules \
|
|
||||||
64-md-raid-assembly.rules; do
|
|
||||||
if [ -f /usr/lib/udev/rules.d/$rule ]; then
|
|
||||||
cp /usr/lib/udev/rules.d/$rule $tmp_mnt/usr/lib/udev/rules.d
|
|
||||||
elif [ -f /lib/udev/rules.d/$rule ]; then
|
|
||||||
cp /lib/udev/rules.d/$rule $tmp_mnt/lib/udev/rules.d
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
save_var need_mdadm
|
|
||||||
Loading…
Reference in New Issue
Block a user