- Deprecated nash replaceed by findfs (#671503)
This commit is contained in:
parent
468bc2a344
commit
7c476da49e
@ -7,7 +7,7 @@
|
||||
|
||||
Name: memtest86+
|
||||
Version: 4.10
|
||||
Release: 4%{?dist}
|
||||
Release: 5%{?dist}
|
||||
License: GPLv2
|
||||
Summary: Stand-alone memory tester for x86 and x86-64 computers
|
||||
Group: System Environment/Base
|
||||
@ -19,7 +19,7 @@ URL: http://www.memtest.org
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
# require glibc-devel.i386 via this file:
|
||||
BuildRequires: %{_includedir}/gnu/stubs-32.h
|
||||
Requires: /sbin/grubby sed coreutils
|
||||
Requires: /sbin/grubby sed coreutils util-linux-ng
|
||||
ExclusiveArch: %{ix86} x86_64
|
||||
|
||||
%description
|
||||
@ -88,6 +88,9 @@ rm -rf %{buildroot}
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Feb 21 2011 Jaroslav Škarvada <jskarvad@redhat.com> - 4.10-5
|
||||
- Deprecated nash replaceed by findfs (#671503)
|
||||
|
||||
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.10-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
|
@ -107,15 +107,12 @@ install() {
|
||||
return
|
||||
fi
|
||||
|
||||
# get the root filesystem to use; if it's on a label make sure it's
|
||||
# get the root filesystem to use; if it's on a label/uuid make sure it's
|
||||
# been configured. if not, get the root device from mount
|
||||
rootdevice=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $1; }}' /etc/fstab)
|
||||
short=$(echo $rootdevice | cut -d= -f1)
|
||||
if [ "$short" == "LABEL" ]; then
|
||||
label=$(echo $rootdevice | cut -d= -f2 |head -n 1)
|
||||
device=$(echo "showlabels" | /sbin/nash --force --quiet |
|
||||
awk '$2 == "'$label'" {print $1}')
|
||||
if [ -z "$device" ]; then
|
||||
if [ "$short" == "LABEL" -o "$short" == "UUID" ]; then
|
||||
if ! /sbin/findfs "$rootdevice" &> /dev/null; then
|
||||
rootdevice=$(mount | awk '$3 == "/" { print $1 }')
|
||||
fi
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user