From 09344fde2a028cdacd5b701acec680ed6c16cd0c Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Thu, 11 Feb 2016 03:05:29 +0000
Subject: [PATCH] kernel: Revert "kernel: set root on NFS when enabled"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This reverts r48591, users needing NFS root will know how to configure
their platform and kernel command-line appropriately.
Reported-by: Petr Å tetiar <ynezz@true.cz>
Signed-off-by: Florian Fainelli <florian@openwrt.org>
SVN-Revision: 48689
---
include/kernel-defaults.mk | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk
index 4b5de5b488..406fd46343 100644
--- a/include/kernel-defaults.mk
+++ b/include/kernel-defaults.mk
@@ -104,18 +104,6 @@ define Kernel/SetNoInitramfs
echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(LINUX_DIR)/.config.set
endef
-ifeq ($(CONFIG_KERNEL_ROOT_NFS),y)
- define Kernel/SetNfsCmdline
- rm -f $(LINUX_DIR)/.config.prev
- mv $(LINUX_DIR)/.config $(LINUX_DIR)/.config.old
- grep -v "CONFIG_CMDLINE=" $(LINUX_DIR)/.config.old > $(LINUX_DIR)/.config
- grep "CONFIG_CMDLINE=" $(LINUX_DIR)/.config.old | cut -d\" -f2 | sed 's/root=\/dev\/\([a-z0-9]*\)\(.*\)/CONFIG_CMDLINE=\"root=\/dev\/nfs ip=dhcp\2\"/' >> $(LINUX_DIR)/.config
- endef
-else
- define Kernel/SetNfsCmdline
- endef
-endif
-
define Kernel/Configure/Default
$(LINUX_CONF_CMD) > $(LINUX_DIR)/.config.target
# copy CONFIG_KERNEL_* settings over to .config.target
@@ -126,7 +114,6 @@ define Kernel/Configure/Default
$(SCRIPT_DIR)/metadata.pl kconfig $(TMP_DIR)/.packageinfo $(TOPDIR)/.config $(KERNEL_PATCHVER) > $(LINUX_DIR)/.config.override
$(SCRIPT_DIR)/kconfig.pl 'm+' '+' $(LINUX_DIR)/.config.target /dev/null $(LINUX_DIR)/.config.override > $(LINUX_DIR)/.config.set
$(call Kernel/SetNoInitramfs)
- $(call Kernel/SetNfsCmdline)
rm -rf $(KERNEL_BUILD_DIR)/modules
cmp -s $(LINUX_DIR)/.config.set $(LINUX_DIR)/.config.prev || { \
cp $(LINUX_DIR)/.config.set $(LINUX_DIR)/.config; \
--
GitLab