Permalink
Browse files

Add ability to boot into text-install mode, and add new dialog menu o…

…ptions

to walk through the install wizard / edit / install menus
  • Loading branch information...
1 parent 0843d04 commit b2dabfa3ea5e950879c720ddff6a68126f0ac97b @kmoore134 kmoore134 committed Oct 15, 2013
View
6 overlays/install-overlay/boot/grub/grub.cfg
@@ -68,7 +68,7 @@ loadfont ($root)/boot/grub/themes/pcbsd/dejavu_bold_14.pf2
insmod png
set theme=($root)/boot/grub/themes/pcbsd/theme.txt
export theme
-set timeout=10
+set timeout=15
menuentry "Graphical Install" {
kfreebsd /boot/kernel/kernel
@@ -77,15 +77,15 @@ menuentry "Graphical Install" {
set kFreeBSD.kern.geom.eli.visible_passphrase=2
}
-menuentry "Run X in VESA mode" {
+menuentry "Graphical Install - (Failsafe VESA mode)" {
kfreebsd /boot/kernel/kernel
kfreebsd_loadenv /boot/device.hints
set kFreeBSD.vfs.root.mountfrom=cd9660:/dev/iso9660/PCBSD_INSTALL
set kFreeBSD.kern.geom.eli.visible_passphrase=2
set kFreeBSD.xvesa=YES
}
-menuentry "Emergency Console" {
+menuentry "Text Install / Emergency Console" {
kfreebsd /boot/kernel/kernel
kfreebsd_loadenv /boot/device.hints
set kFreeBSD.vfs.root.mountfrom=cd9660:/dev/iso9660/PCBSD_INSTALL
View
2 overlays/install-overlay/boot/grub/themes/pcbsd/theme.txt
@@ -22,7 +22,7 @@
# THE SOFTWARE.
#general settings
-title-text: "PC-BSD Bootloader"
+title-text: "PC-BSD / TrueOS Installation"
title-font: "DejaVu Sans Bold 14"
title-color: "#000"
message-font: "DejaVu Sans Regular 12"
View
2 overlays/install-overlay/root/PCBSDStart.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright 2007 PC-BSD Software
+# Copyright 2013 PC-BSD Software
# http://www.pcbsd.com
# Author: Kris Moore
###########################################################################
View
43 overlays/install-overlay/root/PCBSDtext.sh
@@ -1,22 +1,59 @@
#!/bin/sh
# PC-BSD System Install Menu
-# Copyright 2007 PC-BSD Software
+# Copyright 2013 PC-BSD Software
# http://www.pcbsd.com
# Author: Kris Moore
###########################################################################
+. /root/functions.sh
+
+text_install_menu()
+{
+
+ while :
+ do
+ if [ -e "/tmp/sys-install.cfg" ] ; then
+ dialog --title "PC-BSD Text Install" --menu "Please select from the following options:" 20 55 15 wizard "Re-Run install wizard" edit "Edit install script" install "Start installation" back "Return to previous menu" 2>/tmp/answer
+ else
+ dialog --title "PC-BSD Text Install" --menu "Please select from the following options:" 20 55 15 wizard "Run install wizard" back "Return to previous menu" 2>/tmp/answer
+ fi
+
+ ANS="`cat /tmp/answer`"
+
+ case $ANS in
+ wizard) pc-installdialog
+ rtn
+ ;;
+ edit) vi /tmp/sys-install.cfg
+ rtn
+ ;;
+ install) echo "This will begin the installation, continue?"
+ echo -e "(y/n)\c"
+ read tmp
+ if [ "$tmp" = "y" -o "$tmp" = "Y" ] ; then
+ pc-sysinstall -c /tmp/sys-install.cfg
+ rtn
+ fi
+ ;;
+ back) break ;;
+ *) ;;
+ esac
+ done
+}
+
DRES="1024x768"
while
i="1"
do
-dialog --title "PC-BSD Installation Menu" --menu "Please select from the following options:" 20 55 15 install "Start graphical install" vesa "Start graphical install (VESA)" utility "System Utilities" reboot "Reboot the system" 2>/tmp/answer
+dialog --title "PC-BSD Installation Menu" --menu "Please select from the following options:" 20 55 15 install "Start text install" xorg "Start graphical install" vesa "Start graphical install (VESA)" utility "System Utilities" reboot "Reboot the system" 2>/tmp/answer
ANS="`cat /tmp/answer`"
case $ANS in
- install) echo "Starting PC-BSD System Installer.. Please wait.."
+ install) text_install_menu ;;
+ xinstall) echo "Starting PC-BSD System Installer.. Please wait.."
startx 2>/tmp/Xerrors ;;
vesa) echo "Starting PC-BSD System Installer.. Please wait.."
cp /root/cardDetect/XF86Config.compat /etc/X11/xorg.conf
View
6 overlays/install-overlay/root/functions.sh
@@ -67,3 +67,9 @@ start_xorg()
fi
}
+
+rtn()
+{
+ echo "Press ENTER to continue"
+ read tmp
+}

0 comments on commit b2dabfa

Please sign in to comment.