[PC-BSD Commits] r19986 - pcbsd/current/overlays/desktop-overlay/boot

svn at pcbsd.org svn at pcbsd.org
Fri Oct 26 12:05:40 PDT 2012


Author: kris
Date: 2012-10-26 19:05:40 +0000 (Fri, 26 Oct 2012)
New Revision: 19986

Modified:
   pcbsd/current/overlays/desktop-overlay/boot/beastie.4th
   pcbsd/current/overlays/desktop-overlay/boot/loader.conf
Log:

Make enabling safe mode not disable ACPI, since the user can select that
independantly as well. 

Also, disable the splash screen module for now, since still getting reports
from users about it causing bad things to occur with X and such



Modified: pcbsd/current/overlays/desktop-overlay/boot/beastie.4th
===================================================================
--- pcbsd/current/overlays/desktop-overlay/boot/beastie.4th	2012-10-26 18:00:36 UTC (rev 19985)
+++ pcbsd/current/overlays/desktop-overlay/boot/beastie.4th	2012-10-26 19:05:40 UTC (rev 19986)
@@ -607,13 +607,6 @@
 				s" 0" s" hint.acpi.0.disabled" setenv
 			then
 			current-safe @ if
-				s" arch-i386" environment? if
-					drop
-					s" acpi_load" unsetenv
-					s" 1" s" hint.acpi.0.disabled" setenv
-					s" 1" s" loader.acpi_disabled_by_user" setenv
-					s" 1" s" hint.apic.0.disabled" setenv
-				then
 				s" 0" s" hw.ata.ata_dma" setenv
 				s" 0" s" hw.ata.atapi_dma" setenv
 				s" 0" s" hw.ata.wc" setenv

Modified: pcbsd/current/overlays/desktop-overlay/boot/loader.conf
===================================================================
--- pcbsd/current/overlays/desktop-overlay/boot/loader.conf	2012-10-26 18:00:36 UTC (rev 19985)
+++ pcbsd/current/overlays/desktop-overlay/boot/loader.conf	2012-10-26 19:05:40 UTC (rev 19986)
@@ -41,9 +41,9 @@
 beastie_theme="/boot/themes/default/theme.conf"
 
 # Load splash screen
-splash_pcx_load="YES"
-bitmap_load="YES"
-bitmap_name="/boot/loading-screen.pcx"
+#splash_pcx_load="YES"
+#bitmap_load="YES"
+#bitmap_name="/boot/loading-screen.pcx"
 
 # Speed up boot
 kern.cam.scsi_delay="500"



More information about the Commits mailing list