Accepting request 35966 from Base:System
checked in (request 35966) OBS-URL: https://build.opensuse.org/request/show/35966 OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=15
This commit is contained in:
parent
d334228ead
commit
f2bbb9ba61
@ -2,7 +2,7 @@
|
||||
#%stage: block
|
||||
#%modules: nfs
|
||||
#%programs: /sbin/mount.nfs
|
||||
#%if: "$rootfstype" = "nfs" -a "$interface"
|
||||
#%if: "$rootfstype" = "nfs" -o "$interface"
|
||||
#
|
||||
##### Network FileSystem
|
||||
##
|
||||
@ -22,8 +22,6 @@
|
||||
|
||||
if [ -n "$ROOTPATH" -a -z "$cmd_root" ] ; then
|
||||
case "$ROOTPATH" in
|
||||
iscsi:*)
|
||||
;;
|
||||
*:*)
|
||||
rootfstype="nfs"
|
||||
rootdev="$ROOTPATH" ;;
|
||||
@ -42,17 +40,17 @@ if [ -n "$ROOTPATH" -a -z "$cmd_root" ] ; then
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -z "$rootdev" ]; then
|
||||
echo "no local root= kernel option given and no root server set by the dhcp server."
|
||||
echo "exiting to /bin/sh"
|
||||
cd /
|
||||
PATH=$PATH PS1='$ ' /bin/sh -i
|
||||
fi
|
||||
|
||||
if [ "$rootfstype" = "nfs" ]; then
|
||||
# load the nfs module before using it
|
||||
load_modules
|
||||
|
||||
if [ -z "$rootdev" ]; then
|
||||
echo "no local root= kernel option given and no root server set by the dhcp server."
|
||||
echo "exiting to /bin/sh"
|
||||
cd /
|
||||
PATH=$PATH PS1='$ ' /bin/sh -i
|
||||
fi
|
||||
|
||||
rootfsmod=
|
||||
if [ -n "$rootflags" ] ; then
|
||||
rootflags="${rootflags},nolock"
|
||||
|
@ -1,9 +1,3 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 26 15:39:05 CET 2010 - mmarek@suse.cz
|
||||
|
||||
- mkinitrd-boot.sh: Do not do anything over if iscsi should be used
|
||||
(bnc#590135).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 9 21:18:22 UTC 2010 - nfbrown@novell.com
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user