From fe566d84aef1540947b97a50dda24acd0676632b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 3 Nov 2011 00:46:29 +0000 Subject: [PATCH] * Remove references to the "safemode" boot option, which doesn't do anything. svn path=/nixos/trunk/; revision=30199 --- modules/services/hardware/udev.nix | 4 +--- modules/system/boot/stage-2-init.sh | 3 --- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix index 2af4a50e230..98443f9758a 100644 --- a/modules/services/hardware/udev.nix +++ b/modules/services/hardware/udev.nix @@ -138,9 +138,7 @@ in Whether to try to load kernel modules for all detected hardware. Usually this does a good job of providing you with the modules you need, but sometimes it can crash the system or cause other - nasty effects. If the hardware scan is turned on, it can be - disabled at boot time by adding the safemode - parameter to the kernel command line. + nasty effects. ''; }; diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh index 28d721e6b65..10165049046 100644 --- a/modules/system/boot/stage-2-init.sh +++ b/modules/system/boot/stage-2-init.sh @@ -71,9 +71,6 @@ for o in $(cat /proc/cmdline); do # !!! argh, can't pass a startup event to Upstart yet. exec @shell@ ;; - safemode) - safeMode=1 - ;; resume=*) set -- $(IFS==; echo $o) resumeDevice=$2