Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

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

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
  • 2 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
View
7 src-sh/pc-extractoverlay/pc-extractoverlay
@@ -56,13 +56,6 @@ do_desktop_overlay()
status="1"
fi
- # Make sure correct beastie.4th menu is showing
- grep -q 'pcbsd_boot="YES"' /boot/loader.conf
- if [ $? -ne 0 ] ; then
- # Enable the PC-BSD beastie.4th menu in /boot/loader.conf
- echo "pcbsd_boot=\"YES\"" >> /boot/loader.conf
- fi
-
# Make sure this system is flagged as a desktop
if [ ! -e "/etc/defaults/pcbsd" ] ; then
touch /etc/defaults/pcbsd
View
12 src-sh/xtrafiles/local/share/pcbsd/scripts/sys-init.sh
@@ -31,14 +31,20 @@ sh /usr/local/share/pcbsd/scripts/reset-firewall
/usr/local/bin/pc-extractoverlay ports
# Add our notice to top of loader.conf
-mv /boot/loader.conf /boot/loader.conf.tmp
+if [ -e "/boot/loader.conf" ] ; then
+ mv /boot/loader.conf /boot/loader.conf.tmp
+fi
+
cat <<EOF >/boot/loader.conf
# * IMPORTANT NOTICE *
# Run 'grub-mkconfig -o /boot/grub/grub.cfg' after making changes to this file
###############################################################################
EOF
-cat /boot/loader.conf.tmp >> /boot/loader.conf
-rm /boot/loader.conf.tmp
+
+if [ -e "/boot/loader.conf.tmp" ] ; then
+ cat /boot/loader.conf.tmp >> /boot/loader.conf
+ rm /boot/loader.conf.tmp
+fi
################################################
# Do desktop specific init

No commit comments for this range

Something went wrong with that request. Please try again.