Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
  • 2 commits
  • 66 files changed
  • 0 commit comments
  • 1 contributor
Showing with 358 additions and 0 deletions.
  1. +3 −0 src-sh/pbi-manager/pbi-manager
  2. BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/pcbsdfont.pf2
  3. +2 −0 src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/README
  4. BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/background.png
  5. BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/blob_w.png
  6. BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/boot_menu_c.png
  7. BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/boot_menu_e.png
  8. BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/boot_menu_n.png
  9. BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/boot_menu_ne.png
  10. BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/boot_menu_nw.png
  11. BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/boot_menu_s.png
  12. BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/boot_menu_se.png
  13. BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/boot_menu_sw.png
  14. BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/boot_menu_w.png
  15. BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/dejavu_10.pf2
  16. BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/dejavu_12.pf2
  17. BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/dejavu_14.pf2
  18. BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/dejavu_16.pf2
  19. BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/dejavu_bold_14.pf2
  20. BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/slider_c.png
  21. BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/slider_n.png
  22. BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/slider_s.png
  23. BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/terminal_box_c.png
  24. BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/terminal_box_e.png
  25. BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/terminal_box_n.png
  26. BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/terminal_box_ne.png
  27. BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/terminal_box_nw.png
  28. BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/terminal_box_s.png
  29. BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/terminal_box_se.png
  30. BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/terminal_box_sw.png
  31. BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/terminal_box_w.png
  32. +83 −0 src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/theme.txt
  33. +2 −0 src-sh/pc-extractoverlay/ports-overlay/usr/local/etc/default/grub
  34. +4 −0 src-sh/pc-extractoverlay/ports-overlay/usr/local/etc/grub.d/10_kfreebsd
  35. +179 −0 src-sh/pc-extractoverlay/ports-overlay/usr/local/etc/grub.d/10_ktrueos
  36. BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/pcbsdfont.pf2
  37. +2 −0 src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/README
  38. BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/background.png
  39. BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/blob_w.png
  40. BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/boot_menu_c.png
  41. BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/boot_menu_e.png
  42. BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/boot_menu_n.png
  43. BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/boot_menu_ne.png
  44. BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/boot_menu_nw.png
  45. BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/boot_menu_s.png
  46. BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/boot_menu_se.png
  47. BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/boot_menu_sw.png
  48. BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/boot_menu_w.png
  49. BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/dejavu_10.pf2
  50. BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/dejavu_12.pf2
  51. BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/dejavu_14.pf2
  52. BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/dejavu_16.pf2
  53. BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/dejavu_bold_14.pf2
  54. BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/slider_c.png
  55. BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/slider_n.png
  56. BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/slider_s.png
  57. BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/terminal_box_c.png
  58. BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/terminal_box_e.png
  59. BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/terminal_box_n.png
  60. BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/terminal_box_ne.png
  61. BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/terminal_box_nw.png
  62. BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/terminal_box_s.png
  63. BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/terminal_box_se.png
  64. BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/terminal_box_sw.png
  65. BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/terminal_box_w.png
  66. +83 −0 src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/theme.txt
View
3 src-sh/pbi-manager/pbi-manager
@@ -7443,6 +7443,9 @@ getZFSTank() {
# Source our shared PCBSD functions
. /usr/local/share/pcbsd/scripts/functions.sh
+# Set the default umask
+umask 022
+
# Main program operation
##############################################################
init_vars
View
BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/pcbsdfont.pf2
Binary file not shown.
View
2 src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/README
@@ -0,0 +1,2 @@
+PC-BSD GRUB2 default theme
+Copied and modified from the default "starfield" theme
View
BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/background.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/blob_w.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/boot_menu_c.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/boot_menu_e.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/boot_menu_n.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/boot_menu_ne.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/boot_menu_nw.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/boot_menu_s.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/boot_menu_se.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/boot_menu_sw.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/boot_menu_w.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/dejavu_10.pf2
Binary file not shown.
View
BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/dejavu_12.pf2
Binary file not shown.
View
BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/dejavu_14.pf2
Binary file not shown.
View
BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/dejavu_16.pf2
Binary file not shown.
View
BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/dejavu_bold_14.pf2
Binary file not shown.
View
BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/slider_c.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/slider_n.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/slider_s.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/terminal_box_c.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/terminal_box_e.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/terminal_box_n.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/terminal_box_ne.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/terminal_box_nw.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/terminal_box_s.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/terminal_box_se.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/terminal_box_sw.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/terminal_box_w.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
83 src-sh/pc-extractoverlay/desktop-overlay/boot/grub/themes/pcbsd/theme.txt
@@ -0,0 +1,83 @@
+# Default theme for GRUB2
+#
+# Copyright (C) 2011 Daniel Tschudi
+# Copyright (C) 2013 Kris Moore
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+#general settings
+title-text: "PC-BSD Bootloader"
+title-font: "DejaVu Sans Bold 14"
+title-color: "#fff"
+message-font: "DejaVu Sans Regular 12"
+message-color: "#fff"
+message-bg-color: "#fff"
+terminal-box: "terminal_box_*.png"
+terminal-font: "DejaVu Sans Regular 12"
+desktop-image: "background.png"
+
+#help bar at the bottom
++ label {
+ top = 100%-25
+ left = 0
+ width = 100%
+ height = 20
+ text = "@KEYMAP_MIDDLE@"
+ align = "center"
+ font = "DejaVu Sans Regular 10"
+ color = "#FFF"
+}
+
+#boot menu
++ boot_menu {
+ left = 10%
+ width = 80%
+ top = 20%
+ height = 50%
+ item_font = "DejaVu Sans Regular 12"
+ item_color = "#FFF"
+ selected_item_font = "DejaVu Sans Bold 14"
+ selected_item_color= "#FFF"
+ selected_item_pixmap_style = "blob_*.png"
+ icon_height = 25
+ icon_width = 25
+ item_height = 26
+ item_padding = 0
+ item_icon_space = 0
+ item_spacing = 1
+ scrollbar = true
+ scrollbar_width = 20
+ scrollbar_thumb = "slider_*.png"
+ menu_pixmap_style = "boot_menu_*.png"
+}
+
+#progress bar
++ progress_bar {
+ id = "__timeout__"
+ left = 15%
+ top = 80%
+ height = 20
+ width = 70%
+ font = "DejaVu Sans Regular 12"
+ text_color = "#000"
+ fg_color = "#fff"
+ bg_color = "#6ac"
+ border_color = "#fff"
+ text = "@TIMEOUT_NOTIFICATION_LONG@"
+}
View
2 src-sh/pc-extractoverlay/ports-overlay/usr/local/etc/default/grub
@@ -0,0 +1,2 @@
+GRUB_THEME=/boot/grub/themes/pcbsd/theme.txt
+GRUB_FONT=/boot/grub/pcbsdfont.pf2
View
4 src-sh/pc-extractoverlay/ports-overlay/usr/local/etc/grub.d/10_kfreebsd
@@ -0,0 +1,4 @@
+#! /bin/sh
+
+# Exit for now, we can use 10_ktrueos instead
+return 0
View
179 src-sh/pc-extractoverlay/ports-overlay/usr/local/etc/grub.d/10_ktrueos
@@ -0,0 +1,179 @@
+#!/bin/sh
+#
+# Copyright 2013 iXsystems (Kris Moore)
+# All rights reserved
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted providing that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+# Script to detect TrueOS / PC-BSD disk installations and create grub
+# entries for them
+
+display_loaderopts()
+{
+ # Optional ARG1, set to a ZFS dataset to mount and read values from
+ if [ -n "$1" ] ; then
+ fMnt="/mnt.$$"
+ mkdir $fMnt
+ mount -t zfs ${1} $fMnt >/dev/null
+ if [ $? -ne 0 ] ; then
+ echo "Failed to mount ${1}" >&2
+ return
+ fi
+ else
+ fMnt=""
+ fi
+
+ # Create our placeholder to save _load entries to parse
+ touch /tmp/.lRObjs.$$
+ touch /tmp/.lSysCtls.$$
+
+ # Loader files, in order of which to read them
+ lFiles="${fMnt}/boot/device.hints ${fMnt}/boot/loader.conf.local ${fMnt}/boot/loader.conf ${fMnt}/boot/loader.conf.pcbsd"
+ for f in $lFiles
+ do
+ if [ ! -e "$f" ] ; then continue ; fi
+
+ # Lets parse any of the _load= lines
+ grep "_load=" ${f} | grep -v "^#" >/tmp/.lObjs.$$
+ while read line
+ do
+ loadVal="`echo $line | cut -d '=' -f 1`"
+ # Is this value already set in a higher priority file?
+ grep -q "^${loadVal}" /tmp/.lRObjs.$$
+ if [ $? -eq 0 ];then continue; fi
+
+ # Save this value for later
+ echo "$line" >> /tmp/.lRObjs.$$
+ haveObjs=1
+
+ done < /tmp/.lObjs.$$
+ rm /tmp/.lObjs.$$
+
+ # Lets look for any sysctls to set
+ grep "." ${f} | grep "=" | grep -v "^#" | grep -v "_load" >/tmp/.sObjs.$$
+ while read line
+ do
+ loadVal="`echo $line | cut -d '=' -f 1`"
+ # Is this value already set in a higher priority file?
+ grep -q "^${loadVal}" /tmp/.lSysCtls.$$
+ if [ $? -eq 0 ];then continue; fi
+
+ # Save this value for later
+ echo "$line" >> /tmp/.lSysCtls.$$
+ haveSysCtls=1
+
+ done < /tmp/.sObjs.$$
+ rm /tmp/.sObjs.$$
+ done
+
+ # Now lets echo out the modules to load
+ if [ "$haveObjs" = "1" ] ; then
+ while read line
+ do
+ echo "$line" | grep -q '"YES"'
+ if [ $? -ne 0 ] ; then continue ; fi
+ module="`echo $line | cut -d '=' -f 1 | sed 's|_load||g'`"
+ # Try to locate module now
+ if [ -e "${fMnt}/boot/kernel/${module}.ko" ] ; then
+ mPath="kernel"
+ elif [ -e "${fMnt}/boot/modules/${module}.ko" ] ; then
+ mPath="modules"
+ else
+ echo "Unable to locate module ${module}" >&2
+ fi
+ echo " kfreebsd_module_elf ${loadPrefix}/@/boot/${mPath}/${module}.ko"
+ done < /tmp/.lRObjs.$$
+ fi
+
+ # Any sysctls to set?
+ if [ "$haveSysCtls" = "1" ] ; then
+ while read line
+ do
+ # Strip out the vfs.root.mountfrom, we set that elsewhere
+ echo "$line" | grep -q "vfs.root.mountfrom"
+ if [ $? -eq 0 ] ; then continue ; fi
+
+ val="`echo $line | sed 's|"||g'`"
+ echo " set kFreeBSD.${val}"
+ done < /tmp/.lSysCtls.$$
+ fi
+
+ rm /tmp/.lRObjs.$$
+ rm /tmp/.lSysCtls.$$
+ if [ -n "$1" ] ; then
+ umount /mnt.$$ >/dev/null
+ rmdir /mnt.$$ >/dev/null
+ fi
+}
+
+detect_beadm()
+{
+ which -s beadm
+ if [ $? -ne 0 ] ; then return 0; fi
+ if [ -e "/etc/defaults/pcbsd" ] ; then
+ NICK="PC-BSD"
+ else
+ NICK="TrueOS"
+ fi
+
+ # Get list of beadm datasets
+ for b in `beadm list 2>/dev/null| grep -v "Created" | cut -d ' ' -f 1`
+ do
+ # Got a beadm snapshot, lets get the complete dataset name
+ cdataset=`beadm list -a | grep "/ROOT/${b}" | awk '{print $1}'`
+ ztank=`echo $cdataset | cut -d '/' -f 1`
+ shortdataset="/`echo $cdataset | cut -d '/' -f 2-5`"
+
+ # Lets echo the main guts of the BE loader
+ cat << EOF
+# Start TrueOS BE
+menuentry "$NICK - Boot Environment ($b)" {
+ insmod zfs
+ search -s -l $ztank
+ kfreebsd ${shortdataset}/@/boot/kernel/kernel
+ kfreebsd_module ${shortdataset}/@/boot/zfs/zpool.cache type=/boot/zfs/zpool.cache
+ set kFreeBSD.vfs.root.mountfrom=zfs:$cdataset
+EOF
+
+ # Now lets look for options in loader.conf to load
+ loadPrefix="${shortdataset}"
+ # If this is the current mounted dataset, we can skip mounting it
+ mount | grep -q "$cdataset on / ("
+ if [ $? -eq 0 ] ; then
+ display_loaderopts
+ else
+ display_loaderopts $cdataset
+ fi
+
+ # Lastly lets close the section
+ cat << EOF
+}
+# End TrueOS BE
+
+EOF
+ done
+
+}
+
+# Detect our types of disk layouts
+detect_beadm
+
View
BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/pcbsdfont.pf2
Binary file not shown.
View
2 src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/README
@@ -0,0 +1,2 @@
+PC-BSD GRUB2 default theme
+Copied and modified from the default "starfield" theme
View
BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/background.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/blob_w.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/boot_menu_c.png
Diff not rendered.
View
BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/boot_menu_e.png
Diff not rendered.
View
BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/boot_menu_n.png
Diff not rendered.
View
BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/boot_menu_ne.png
Diff not rendered.
View
BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/boot_menu_nw.png
Diff not rendered.
View
BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/boot_menu_s.png
Diff not rendered.
View
BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/boot_menu_se.png
Diff not rendered.
View
BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/boot_menu_sw.png
Diff not rendered.
View
BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/boot_menu_w.png
Diff not rendered.
View
BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/dejavu_10.pf2
Binary file not shown.
View
BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/dejavu_12.pf2
Binary file not shown.
View
BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/dejavu_14.pf2
Binary file not shown.
View
BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/dejavu_16.pf2
Binary file not shown.
View
BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/dejavu_bold_14.pf2
Binary file not shown.
View
BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/slider_c.png
Diff not rendered.
View
BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/slider_n.png
Diff not rendered.
View
BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/slider_s.png
Diff not rendered.
View
BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/terminal_box_c.png
Diff not rendered.
View
BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/terminal_box_e.png
Diff not rendered.
View
BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/terminal_box_n.png
Diff not rendered.
View
BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/terminal_box_ne.png
Diff not rendered.
View
BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/terminal_box_nw.png
Diff not rendered.
View
BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/terminal_box_s.png
Diff not rendered.
View
BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/terminal_box_se.png
Diff not rendered.
View
BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/terminal_box_sw.png
Diff not rendered.
View
BIN src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/terminal_box_w.png
Diff not rendered.
View
83 src-sh/pc-extractoverlay/server-overlay/boot/grub/themes/pcbsd/theme.txt
@@ -0,0 +1,83 @@
+# Default theme for GRUB2
+#
+# Copyright (C) 2011 Daniel Tschudi
+# Copyright (C) 2013 Kris Moore
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+#general settings
+title-text: "TrueOS Bootloader"
+title-font: "DejaVu Sans Bold 14"
+title-color: "#fff"
+message-font: "DejaVu Sans Regular 12"
+message-color: "#fff"
+message-bg-color: "#fff"
+terminal-box: "terminal_box_*.png"
+terminal-font: "DejaVu Sans Regular 12"
+desktop-image: "background.png"
+
+#help bar at the bottom
++ label {
+ top = 100%-25
+ left = 0
+ width = 100%
+ height = 20
+ text = "@KEYMAP_MIDDLE@"
+ align = "center"
+ font = "DejaVu Sans Regular 10"
+ color = "#FFF"
+}
+
+#boot menu
++ boot_menu {
+ left = 10%
+ width = 80%
+ top = 20%
+ height = 50%
+ item_font = "DejaVu Sans Regular 12"
+ item_color = "#FFF"
+ selected_item_font = "DejaVu Sans Bold 14"
+ selected_item_color= "#FFF"
+ selected_item_pixmap_style = "blob_*.png"
+ icon_height = 25
+ icon_width = 25
+ item_height = 26
+ item_padding = 0
+ item_icon_space = 0
+ item_spacing = 1
+ scrollbar = true
+ scrollbar_width = 20
+ scrollbar_thumb = "slider_*.png"
+ menu_pixmap_style = "boot_menu_*.png"
+}
+
+#progress bar
++ progress_bar {
+ id = "__timeout__"
+ left = 15%
+ top = 80%
+ height = 20
+ width = 70%
+ font = "DejaVu Sans Regular 12"
+ text_color = "#000"
+ fg_color = "#fff"
+ bg_color = "#6ac"
+ border_color = "#fff"
+ text = "@TIMEOUT_NOTIFICATION_LONG@"
+}

No commit comments for this range

Something went wrong with that request. Please try again.