2012-04-19 14:54:47 +00:00
|
|
|
From 689c3e1fcd0fff7ae978d0543fa980272f89dff2 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Harald Hoyer <harald@redhat.com>
|
|
|
|
|
Date: Thu, 19 Apr 2012 16:41:04 +0200
|
|
|
|
|
Subject: [PATCH] network/parse-ip-opts.sh: remove check for netroot
|
|
|
|
|
|
|
|
|
|
with anaconda and all other kind of stuff, we might want network, even
|
|
|
|
|
for root not on the network
|
|
|
|
|
---
|
|
|
|
|
modules.d/40network/parse-ip-opts.sh | 8 --------
|
2012-05-22 09:49:50 +00:00
|
|
|
1 file changed, 8 deletions(-)
|
2012-04-19 14:54:47 +00:00
|
|
|
|
|
|
|
|
diff --git a/modules.d/40network/parse-ip-opts.sh b/modules.d/40network/parse-ip-opts.sh
|
|
|
|
|
index 97702a2..5637a9a 100755
|
|
|
|
|
--- a/modules.d/40network/parse-ip-opts.sh
|
|
|
|
|
+++ b/modules.d/40network/parse-ip-opts.sh
|
|
|
|
|
@@ -17,14 +17,6 @@
|
|
|
|
|
command -v getarg >/dev/null || . /lib/dracut-lib.sh
|
|
|
|
|
command -v ibft_to_cmdline >/dev/null || . /lib/net-lib.sh
|
|
|
|
|
|
|
|
|
|
-# Check if ip= lines should be used
|
|
|
|
|
-if getarg ip= >/dev/null ; then
|
|
|
|
|
- if [ -z "$netroot" ] ; then
|
|
|
|
|
- echo "Warning: No netboot configured, ignoring ip= lines"
|
|
|
|
|
- return;
|
|
|
|
|
- fi
|
|
|
|
|
-fi
|
|
|
|
|
-
|
|
|
|
|
# Don't mix BOOTIF=macaddr from pxelinux and ip= lines
|
|
|
|
|
getarg ip= >/dev/null && getarg BOOTIF= >/dev/null && \
|
|
|
|
|
die "Mixing BOOTIF and ip= lines is dangerous"
|
