[PC-BSD Commits] r7464 - in pcbsd/current: installcd-overlay/boot mfsroot-overlay/etc mfsroot-overlay/root
svn at pcbsd.org
svn at pcbsd.org
Mon Aug 30 14:14:11 PDT 2010
Author: kris
Date: 2010-08-30 14:14:11 -0700 (Mon, 30 Aug 2010)
New Revision: 7464
Modified:
pcbsd/current/installcd-overlay/boot/beastie.4th
pcbsd/current/mfsroot-overlay/etc/SetupLive.sh
pcbsd/current/mfsroot-overlay/etc/pcbsd-rc.sh
pcbsd/current/mfsroot-overlay/root/PCBSDStart.sh
Log:
Make some changes to our startup of install / live media, now you can use "vesa" mode out of box
on LIVE DVDs, same as on INSTALL DVD/CD/USB
Modified: pcbsd/current/installcd-overlay/boot/beastie.4th
===================================================================
--- pcbsd/current/installcd-overlay/boot/beastie.4th 2010-08-30 21:02:10 UTC (rev 7463)
+++ pcbsd/current/installcd-overlay/boot/beastie.4th 2010-08-30 21:14:11 UTC (rev 7464)
@@ -39,7 +39,6 @@
variable promptwidth
variable bootkey
-variable bootlive
variable bootacpikey
variable bootsafekey
variable bootverbosekey
@@ -201,10 +200,10 @@
46 4 print-logo
42 20 2 2 box
13 6 at-xy ." Welcome to PC-BSD!"
- printmenuitem ." Boot Installer [default]" bootkey !
+ printmenuitem ." Boot [default]" bootkey !
s" arch-i386" environment? if
drop
- printmenuitem ." Boot Installer with ACPI " bootacpikey !
+ printmenuitem ." Boot with ACPI " bootacpikey !
acpienabled? if
." disabled"
else
@@ -213,11 +212,10 @@
else
-2 bootacpikey !
then
- printmenuitem ." Boot in Live Mode" bootlive !
printmenuitem ." Boot in Safe Mode" bootsafekey !
printmenuitem ." Boot with verbose logging" bootverbosekey !
printmenuitem ." Boot to emergency console" bootemergencykey !
- printmenuitem ." Run X in VESA mode" xvesa !
+ printmenuitem ." Boot with X in VESA mode" xvesa !
printmenuitem ." Escape to loader prompt" escapekey !
menuX @ 20 at-xy
." Select option, [Enter] for default"
@@ -321,10 +319,6 @@
1 xvesa_set !
then
then
- dup bootlive @ = if
- s" YES" s" boot_livedvd" setenv
- 0 boot
- then
dup bootsinglekey @ = if
s" YES" s" boot_single" setenv
0 boot
Modified: pcbsd/current/mfsroot-overlay/etc/SetupLive.sh
===================================================================
--- pcbsd/current/mfsroot-overlay/etc/SetupLive.sh 2010-08-30 21:02:10 UTC (rev 7463)
+++ pcbsd/current/mfsroot-overlay/etc/SetupLive.sh 2010-08-30 21:14:11 UTC (rev 7464)
@@ -1,6 +1,5 @@
#!/bin/sh
-
MEM=`sysctl hw.realmem | cut -d " " -f 2`
# Divide a few times to get the size in MB
MEM="`/bin/expr $MEM / 1024`"
@@ -50,6 +49,8 @@
ln -s /mntuzip/usr/PCBSD/$i /usr/PCBSD/$i
done
+# Set the marker that this is a LIVE bootup
+touch /usr/pcbsd-live
# Create a /liveroot file system with some extra space
/sbin/mdmfs -S -s 32M -O space md8 /liveroot
Modified: pcbsd/current/mfsroot-overlay/etc/pcbsd-rc.sh
===================================================================
--- pcbsd/current/mfsroot-overlay/etc/pcbsd-rc.sh 2010-08-30 21:02:10 UTC (rev 7463)
+++ pcbsd/current/mfsroot-overlay/etc/pcbsd-rc.sh 2010-08-30 21:14:11 UTC (rev 7464)
@@ -19,7 +19,7 @@
/sbin/mount_cd9660 $i /cdmnt >/dev/null 2>/dev/null
if [ "$?" = "0" ]
then
- if [ -e "/cdmnt/uzip/usr.uzip" ]
+ if [ -e "/cdmnt/pcbsd-media" ]
then
FOUND=1
CDDEV="$i"
@@ -47,7 +47,7 @@
/sbin/mount -r $j /cdmnt >/dev/null 2>/dev/null
if [ "$?" = "0" ]
then
- if [ -e "/cdmnt/uzip/usr.uzip" ]
+ if [ -e "/cdmnt/pcbsd-media" ]
then
FOUND=1
CDDEV="$j"
@@ -73,7 +73,7 @@
/sbin/mount -r -t msdosfs $j /cdmnt >/dev/null 2>/dev/null
if [ "$?" = "0" ]
then
- if [ -e "/cdmnt/uzip/usr.uzip" ]
+ if [ -e "/cdmnt/pcbsd-media" ]
then
FOUND=1
CDDEV="$j"
@@ -104,7 +104,7 @@
/sbin/mount_cd9660 $i /cdmnt >/dev/null 2>/dev/null
if [ "$?" = "0" ]
then
- if [ -e "/cdmnt/uzip/usr.uzip" ]
+ if [ -e "/cdmnt/pcbsd-media" ]
then
FOUND=1
CDDEV="$i"
@@ -134,14 +134,8 @@
echo "Found PCBSD image on: ${CDDEV}"
fi
-# Check if we are booting in LIVE or INSTALL mode
-bootlive="NO"
-l=`/bin/kenv boot_livedvd 2>/dev/null`
-if [ $? -eq 0 ]; then
- bootlive=$l
-fi
-
-if [ "$bootlive" = "YES" -a -e "/cdmnt/PCBSD.ufs.uzip" ]
+# If we have a LIVE image, boot with it
+if [ "/cdmnt/PCBSD.ufs.uzip" ]
then
# Create a /tmp file system with some extra space
/sbin/mdmfs -S -s 15M -O space md6 /tmp
@@ -152,14 +146,11 @@
sh /etc/SetupLive.sh
else
+ # Installation medium ONLY
# Create a /tmp file system with some extra space
/sbin/mdmfs -S -s 8M -O space md6 /tmp
-
- # Make sure boot_livedvd is unset
- /bin/kenv -q -u boot_livedvd
-
# Run integrity checks
/etc/IntegrityCheck.sh
if [ "$?" != "0" ]
Modified: pcbsd/current/mfsroot-overlay/root/PCBSDStart.sh
===================================================================
--- pcbsd/current/mfsroot-overlay/root/PCBSDStart.sh 2010-08-30 21:02:10 UTC (rev 7463)
+++ pcbsd/current/mfsroot-overlay/root/PCBSDStart.sh 2010-08-30 21:14:11 UTC (rev 7464)
@@ -24,9 +24,7 @@
ln -s /usr/PCBSD /PCBSD >/dev/null 2>/dev/null
# Check if we are booting in LIVE or INSTALL mode
-bootlive="NO"
-l=`/bin/kenv boot_livedvd 2>/dev/null`
-if [ $? -eq 0 ]; then
+if [ -e "/usr/pcbsd-live" ]; then
# We are running LIVE mode, start that script now
sh /root/PCBSDStartLive.sh
exit 0
@@ -39,8 +37,6 @@
/usr/sbin/pc-sysinstall start-autoinstall /tmp/pc-autoinstall.conf
fi
-
-
# Run the intial sorting of directories
mv /root/.fluxbox /uzip/
ln -s /uzip/.fluxbox /root/.fluxbox
@@ -73,7 +69,7 @@
if [ "$xvesa" = "YES" ]
then
- cp /root/cardDetect/XF86Config-usrlocal.compat /etc/X11/xorg.conf
+ cp /root/cardDetect/XF86Config.compat /etc/X11/xorg.conf
fi
startx 2>/tmp/xstartup.log
More information about the Commits
mailing list