This commit is contained in:
parent
ca1dc7c3bb
commit
65feb0c361
14
boot.md
14
boot.md
@ -120,9 +120,8 @@ case "$1" in
|
|||||||
if ! grep -q '^[^#]*[^[:blank:]#]' $mdadm_CONFIG; then
|
if ! grep -q '^[^#]*[^[:blank:]#]' $mdadm_CONFIG; then
|
||||||
# empty /etc/mdadm.conf, "unused"
|
# empty /etc/mdadm.conf, "unused"
|
||||||
rc_status -u
|
rc_status -u
|
||||||
fi
|
else
|
||||||
if ! $mdadm_BIN -A -s -c $mdadm_CONFIG; then
|
$mdadm_BIN -A -s -c $mdadm_CONFIG
|
||||||
rc_failed 1
|
|
||||||
rc_status -v
|
rc_status -v
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
@ -133,14 +132,13 @@ case "$1" in
|
|||||||
then
|
then
|
||||||
rc_failed 1
|
rc_failed 1
|
||||||
rc_status -v
|
rc_status -v
|
||||||
|
chmod 0600 /tmp/mdadm.conf
|
||||||
|
rc_exit
|
||||||
fi
|
fi
|
||||||
chmod 0600 /tmp/mdadm.conf
|
chmod 0600 /tmp/mdadm.conf
|
||||||
if test -s /tmp/mdadm.conf; then
|
if test -s /tmp/mdadm.conf; then
|
||||||
if ! mdadm --assemble --scan --config=/tmp/mdadm.conf
|
mdadm --assemble --scan --config=/tmp/mdadm.conf
|
||||||
then
|
rc_status -v
|
||||||
rc_failed 1
|
|
||||||
rc_status -v
|
|
||||||
fi
|
|
||||||
else
|
else
|
||||||
# no partitions found, "unused"
|
# no partitions found, "unused"
|
||||||
rc_status -u
|
rc_status -u
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Feb 4 19:24:54 CET 2008 - mmarek@suse.cz
|
||||||
|
|
||||||
|
- correctly display rc_status in boot.md
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Jan 23 15:55:24 CET 2008 - mmarek@suse.cz
|
Wed Jan 23 15:55:24 CET 2008 - mmarek@suse.cz
|
||||||
|
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
|
|
||||||
Name: mdadm
|
Name: mdadm
|
||||||
Version: 2.6.4
|
Version: 2.6.4
|
||||||
Release: 17
|
Release: 23
|
||||||
BuildRequires: sgmltool
|
BuildRequires: sgmltool
|
||||||
PreReq: %fillup_prereq %insserv_prereq
|
PreReq: %fillup_prereq %insserv_prereq
|
||||||
Obsoletes: raidtools
|
Obsoletes: raidtools
|
||||||
@ -115,6 +115,8 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_var}/adm/fillup-templates/sysconfig.mdadm
|
%{_var}/adm/fillup-templates/sysconfig.mdadm
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Feb 04 2008 mmarek@suse.cz
|
||||||
|
- correctly display rc_status in boot.md
|
||||||
* Wed Jan 23 2008 mmarek@suse.cz
|
* Wed Jan 23 2008 mmarek@suse.cz
|
||||||
- fixed auto-assembly part of boot.md
|
- fixed auto-assembly part of boot.md
|
||||||
* if /etc/mdadm.conf is empy or only contains whitespace or
|
* if /etc/mdadm.conf is empy or only contains whitespace or
|
||||||
|
Loading…
Reference in New Issue
Block a user