From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 14 Aug 2008 19:35:15 +0000 (+0200)
Subject: Add a grub selection with nosmp
X-Git-Tag: v2.3-beta3~37
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=7842c3e8f35f5629a73d5272230bd2af7c4ce310

Add a grub selection with nosmp
Change description of the bootoptions
---

diff --git a/config/grub/grub.conf b/config/grub/grub.conf
index 8dd79adfa9..8f7825b342 100644
--- a/config/grub/grub.conf
+++ b/config/grub/grub.conf
@@ -14,17 +14,17 @@ title IPFire (vesafb 1024x768)
   kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=791 MOUNT
   initrd /ipfirerd-KVER.img
   savedefault 1
-title IPFire (acpi=off)
+title IPFire (acpi disables)
   root (hd0,0)
   kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 acpi=off MOUNT
   initrd /ipfirerd-KVER.img
   savedefault 2
-title IPFire (vesafb 1024x768, acpi=off)
+title IPFire (single Processor)
   root (hd0,0)
-  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 vga=791 acpi=off MOUNT
+  kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 nosmp MOUNT
   initrd /ipfirerd-KVER.img
   savedefault 3
-title IPFire (emergency - all storage drivers)
+title IPFire (all storage drivers)
   root (hd0,0)
   kernel /vmlinuz-KVER-ipfire root=ROOT rootdelay=10 panic=10 MOUNT
   initrd /ipfirerd-KVER-emergency.img
diff --git a/src/initscripts/init.d/bluetooth b/src/initscripts/init.d/bluetooth
index 4dd8ed322c..6ccd659add 100644
--- a/src/initscripts/init.d/bluetooth
+++ b/src/initscripts/init.d/bluetooth
@@ -24,7 +24,7 @@ case "$1" in
                 ;;
 
         stop)
-                #boot_mesg "Realease rfcomm0..."
+                #boot_mesg "Release rfcomm0..."
 		#rfcomm release rfcomm0
                 #boot_mesg "Stopping Bluetooth passkey-agent..."
 		#killproc /usr/bin/passkey-agent