Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:pcbsd/pcbsd

  • Loading branch information...
commit 408039b6ef8c34eff60f9d7e6c109097ddd35762 2 parents 52fa6eb + 7ae348f
@beanpole135 beanpole135 authored
View
5 build-files/conf/port-make.conf
@@ -32,6 +32,9 @@ OPTIONS_UNSET=JAVA NOUVEAU
# Enable VIMAGE for virtualbox
virtualbox-ose-kmod_SET=VIMAGE
+# VirtualBox Options
+virtualbox_SET=VNC WEBSERVICE VDE
+
# Set some k3b options
k3b_SET=SOX NORMALIZE TRANSCODE
@@ -92,8 +95,6 @@ cups-base_UNSET=GHOSTSCRIPT
php5_SET=APACHE
-virtualbox_SET=VNC WEBSERVICE
-
# Options requested by FreeNAS
nginx_SET=HTTP_FLV HTTP_SSL PASSENGER
redmine_SET=POSTGRESQL PASSENGER
View
2  src-qt4/pc-installgui/scripts/get-zfs-restore-list.sh
@@ -20,5 +20,5 @@ fi
cd /root
-ssh ${SSHKEY} -p $SSHPORT -o PasswordAuthentication=no -o NumberOfPasswordPrompts=0 $SSHUSER@$SSHHOST 'ls .lp-props* 2>/dev/null' 2>/dev/null
+ssh ${SSHKEY} -p $SSHPORT -o StrictHostKeyChecking=no -o PasswordAuthentication=no -o NumberOfPasswordPrompts=0 $SSHUSER@$SSHHOST 'ls .lp-props* 2>/dev/null' 2>/dev/null
exit $?
View
2  src-qt4/pc-sounddetect/rc.d/pc-sounddetect
@@ -7,7 +7,7 @@
. /etc/rc.subr
name="snddetect"
-rcvar=`set_rcvar`
+rcvar=snddetect_enable
stop_cmd="snddetect_stop"
start_cmd="snddetect_start"
View
44 src-sh/pc-sysinstall/examples/README
@@ -12,7 +12,7 @@ installed system
When hostname= is not present, pc-sysinstall will auto-generate
a hostname such as freebsd-XXXX or pcbsd-XXXX
-# installMode=(fresh/upgrade/extract)
+# installMode=(fresh/upgrade/extract/zfsrestore)
Set the type of install we are doing.
@@ -33,6 +33,10 @@ should be a directory with your pre-mounted file-systems ready
for file extraction. When using the "extract" option, /etc/fstab
on the installed system will *not* be automatically configured.
+'zfsrestore' will use zfs send / recv to replicate a remote ZFS
+dataset to your local install. It requires several other flags
+documented below in the ZFS RESTORE section.
+
# installLocation=
Used only when installMode is set to extract.
@@ -293,6 +297,13 @@ The port to use when connecting to a ssh + rsync server
The specified components to install, view available with "./pc-sysinstall list-components"
+# installPackages=xorg cabextract
+
+List of packages to install, can be either pkgng or old style packages
+
+# pkgExt=.txz
+
+Set the file-extension uses for packages, usually .txz or .tbz
########################################################################
# UPGRADE OPTIONS
@@ -400,4 +411,33 @@ localizeKeyVariant is used to update the xorg config to set the keyboard variant
Setting autoLoginUser will enable the specified user to log into the desktop
automatically without entering a password
-$FreeBSD: head/usr.sbin/pc-sysinstall/examples/README 247705 2013-03-03 09:47:47Z jpaetzel $
+########################################################################
+# ZFS RESTORE
+########################################################################
+
+When setting installMode=zfsrestore, the following options are also required
+
+# sshHost=mybackupserver
+
+Hostname or IP address of the machine to pull data via SSH from
+
+# sshPort=22
+
+Port to use for SSH
+
+# sshUser=kdeskbackup
+
+Username to log into SSH with
+
+# sshKey=/root/id_rsa
+
+SSH key file to use with auth into the remote server
+
+# zfsProps=.lp-props-tank1#backups#krisbackup
+
+Location of dataset properties file, usually created by "Life-Preserver" during replication
+
+# zfsRemoteDataset=tank1/backups/krisbackup
+
+Location of remote dataset we will be restoring from
+
View
9 src-sh/pc-thinclient/pc-thinclient
@@ -305,7 +305,7 @@ check_worldports() {
cp /usr/local/etc/pkg-pubkey.cert ${PXEWORLD}/usr/local/etc/
# Start by adding pcbsd-utils
- pkg -c ${PXEWORLD} install -y pcbsd-utils
+ rc_halt "pkg -c ${PXEWORLD} install -y pcbsd-utils"
# Remove old pc-sysinstall so we use new one in /usr/local/sbin
rm ${PXEWORLD}/usr/sbin/pc-sysinstall 2>/dev/null
@@ -316,11 +316,11 @@ check_worldports() {
if [ -e "${PXEWORLD}/usr/local/bin/xv" ] ; then return ; fi
# Install Xorg
- pkg -c ${PXEWORLD} install -y xorg
+ rc_halt "pkg -c ${PXEWORLD} install -y xorg"
# Need to install / use GDM on the base system
if [ ! -e "/usr/local/sbin/gdm" ] ; then
- pkg install -y gdm
+ rc_halt "pkg install -y gdm"
fi
# Disable PCDM since it doesn't do XDMCP
@@ -394,8 +394,7 @@ check_dhcpd() {
if [ "$?" = "0" ] ; then return; fi
echo "Installing $DHCPPORT"
- pkg install -y ${DHCPPORT}
- if [ "$?" != "0" ] ; then exit_err "Failed installing ${DHCPPORT}"; fi
+ rc_halt "pkg install -y ${DHCPPORT}"
}
# Function to display what information to add to external DHCP server
View
2  src-sh/warden/scripts/rc.d/wardenrc
@@ -7,7 +7,7 @@
. /etc/rc.subr
name="warden"
-rcvar=`set_rcvar`
+rcvar="warden_enable"
stop_cmd="warden_stop"
start_cmd="warden_start"
Please sign in to comment.
Something went wrong with that request. Please try again.