This commit is contained in:
parent
aedeade8d4
commit
2e353c77e4
@ -15,10 +15,13 @@
|
|||||||
## root=<server>:/<folder> the nfs root path
|
## root=<server>:/<folder> the nfs root path
|
||||||
##
|
##
|
||||||
|
|
||||||
if [ -z "$rootdev" ]; then
|
# Prefer NFS root setting via DHCP the fallback provided in config/*.
|
||||||
# ROOTPATH gets set via dhcpcd
|
# So at first, consider the command line (that's why we check for "$cmd_root"
|
||||||
|
# being empty here. Then consider the DHCP setting. And finally consider the
|
||||||
|
# fallback via config/*.
|
||||||
|
|
||||||
|
if [ -n "$ROOTPATH" -a -z "$cmd_root" ] ; then
|
||||||
case "$ROOTPATH" in
|
case "$ROOTPATH" in
|
||||||
"") ;;
|
|
||||||
*:*)
|
*:*)
|
||||||
rootfstype="nfs"
|
rootfstype="nfs"
|
||||||
rootdev="$ROOTPATH" ;;
|
rootdev="$ROOTPATH" ;;
|
||||||
@ -31,7 +34,12 @@ if [ -z "$rootdev" ]; then
|
|||||||
rootfstype="nfs"
|
rootfstype="nfs"
|
||||||
fi ;;
|
fi ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
if [ -n "$rootdev" ] ; then
|
||||||
|
echo >&2 "Using root device ($rootdev) provided via DHCP"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z "$rootdev" ]; then
|
if [ -z "$rootdev" ]; then
|
||||||
echo "no local root= kernel option given and no root server set by the dhcp server."
|
echo "no local root= kernel option given and no root server set by the dhcp server."
|
||||||
echo "exiting to /bin/sh"
|
echo "exiting to /bin/sh"
|
||||||
|
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Dec 08 15:37:13 CET 2008 - bwalle@suse.de
|
||||||
|
|
||||||
|
- initrd: Giving the DHCP provided root path a higher priority
|
||||||
|
compared to the fallback from fstab. Command line can still
|
||||||
|
overwrite the DHCP provided root path. (bnc #440192).
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Dec 7 22:20:05 CET 2008 - nfbrown@suse.de
|
Sun Dec 7 22:20:05 CET 2008 - nfbrown@suse.de
|
||||||
|
|
||||||
|
@ -27,7 +27,7 @@ BuildRequires: libevent
|
|||||||
Url: http://nfs.sourceforge.net
|
Url: http://nfs.sourceforge.net
|
||||||
Summary: Support Utilities for Kernel nfsd
|
Summary: Support Utilities for Kernel nfsd
|
||||||
Version: 1.1.3
|
Version: 1.1.3
|
||||||
Release: 16
|
Release: 17
|
||||||
Group: Productivity/Networking/NFS
|
Group: Productivity/Networking/NFS
|
||||||
License: GPL v2 or later
|
License: GPL v2 or later
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
@ -291,6 +291,10 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%doc nfs/*.html nfs/*.ps linux-nfs/* README.NFSv4
|
%doc nfs/*.html nfs/*.ps linux-nfs/* README.NFSv4
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Dec 08 2008 bwalle@suse.de
|
||||||
|
- initrd: Giving the DHCP provided root path a higher priority
|
||||||
|
compared to the fallback from fstab. Command line can still
|
||||||
|
overwrite the DHCP provided root path. (bnc #440192).
|
||||||
* Sun Dec 07 2008 nfbrown@suse.de
|
* Sun Dec 07 2008 nfbrown@suse.de
|
||||||
- gssd-mem-leak
|
- gssd-mem-leak
|
||||||
* set better expiry date for cached auth info
|
* set better expiry date for cached auth info
|
||||||
|
Loading…
Reference in New Issue
Block a user