Changeset 2140efa


Ignore:
Timestamp:
02/19/15 09:25:32 (5 weeks ago)
Author:
Ken Moore <ken@…>
Branches:
master
Children:
83e5700, 94dd8b8b
Parents:
7fd15165 (diff), e6e5f65d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

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

Files:
2 added
17 edited

Legend:

Unmodified
Added
Removed
  • build-files/conf/port-make.conf

    r2eefbf3 rac0f039  
    1111WITH_VDPAU=yes 
    1212WITH_GALLIUM=YES 
     13 
     14# Build ports against the ported openssl version 
     15WITH_OPENSSL_PORT=      yes 
     16# For now don't try libressl, still way too many broken things 
     17#OPENSSL_PORT=          security/libressl 
    1318 
    1419#Openoffice Language Options 
     
    112117mpqc_UNSET=DOCS 
    113118musicpd_SET=LAME SHOUTCAST AAC 
    114 mutt_SET=ASPELL GPGME SMTP TRASH_PATCH NNTP 
     119mutt_SET=ASPELL GPGME SMTP TRASH_PATCH NNTP SIDEBAR_PATCH 
    115120mythtv_SET=BINDINGS LIRC 
    116121nginx_SET=HTTP_FLV HTTP_SSL PASSENGER 
  • src-qt5/pc-installgui/installer.cpp

    r1e77bb0 r9834186  
    2020    haveWarnedSpace=false; 
    2121    force4K = false; 
     22    defaultInstall = true; 
    2223    forceBIOS=""; 
    2324 
     
    533534  force4K = zForce; 
    534535  forceBIOS=biosMode; 
     536  defaultInstall = false; 
     537 
     538  // Check if we are running in EFI mode 
     539  if ( forceBIOS == "efi" ) 
     540    efiMode=true; 
     541  else 
     542    efiMode=false; 
    535543 
    536544  // Save the new disk layout 
     
    721729        msg=tr("Start the restore now?"); 
    722730      else 
    723         msg=tr("Start the installation now?"); 
     731        if ( defaultInstall ) 
     732          msg=tr("Start the default Full-Disk installation now?"); 
     733        else 
     734          msg=tr("Start the Customized-Disk installation now?"); 
    724735 
    725736      int ret = QMessageBox::question(this, tr("PC-BSD Installer"), 
  • src-qt5/pc-installgui/installer.h

    r1e77bb0 r9834186  
    204204    bool efiMode; 
    205205 
     206    // Is the user doing the default installation option? 
     207    bool defaultInstall; 
     208 
    206209    // Restore Options 
    207210    QStringList restOpts; 
  • src-qt5/pc-installgui/wizardDisk.cpp

    r1e77bb0 rfd8dbc8  
    8989{ 
    9090  QString ptag; 
     91  bool ok; 
    9192 
    9293  if ( comboDisk->currentText().isEmpty()) 
     
    100101  for (int i=0; i < sysDisks.count(); ++i) { 
    101102    // Make sure to only add the slices to the listDiskSlices 
    102     if ( sysDisks.at(i).at(0) == "SLICE" && disk == sysDisks.at(i).at(1) && sysDisks.at(i).at(4) != "Unused Space") { 
    103       ptag = sysDisks.at(i).at(4).section(",", 0, 0); 
    104       ptag = ptag.section("/", 0, 0); 
    105       ptag.truncate(15); 
    106       if ( ptag.indexOf(")") == -1 ) 
    107         ptag += ")"; 
    108       comboPartition->addItem(sysDisks.at(i).at(2) + ": " +  sysDisks.at(i).at(3) + "MB " + ptag ); 
     103    if ( sysDisks.at(i).at(0) != "SLICE" ) 
     104      continue; 
     105    // Only add the slices for the target disk 
     106    if ( disk != sysDisks.at(i).at(1) ) 
     107      continue; 
     108    // If we have freespace, only list if it is -gt 10GB 
     109    if ( sysDisks.at(i).at(4) == "Unused Space" ) { 
     110      sysDisks.at(i).at(3).toInt(&ok); 
     111      if ( !ok ) 
     112        continue; 
     113      if ( sysDisks.at(i).at(3).toInt(&ok) < 10000 ) 
     114        continue; 
    109115    } 
     116 
     117    // Add the slice / partition 
     118    ptag = sysDisks.at(i).at(4).section(",", 0, 0); 
     119    ptag = ptag.section("/", 0, 0); 
     120    ptag.truncate(15); 
     121    if ( ptag.indexOf(")") == -1 ) 
     122      ptag += ")"; 
     123    comboPartition->addItem(sysDisks.at(i).at(2) + ": " +  sysDisks.at(i).at(3) + "MB " + ptag ); 
    110124  } 
    111125 
     
    639653  disk.truncate(disk.indexOf(" -")); 
    640654 
    641   int safeBuf = 10; 
     655  int safeBuf = 15; 
    642656 
    643657  // If on EFI we subtract 100MiB to save for a FAT16/EFI partition 
    644   if ( efiMode ) 
    645     safeBuf = 110; 
     658  if ( radioUEFI->isChecked() ) 
     659    safeBuf = 115; 
    646660 
    647661  // Check the full disk 
     
    653667        sysDisks.at(i).at(2).toInt(&ok); 
    654668        if( ok ) 
    655           return sysDisks.at(i).at(2).toInt(&ok) - safeBuf; 
     669          return (sysDisks.at(i).at(2).toInt(&ok) - safeBuf); 
    656670        else 
    657671          return -1; 
     
    668682        sysDisks.at(i).at(3).toInt(&ok); 
    669683        if( ok ) 
    670           return sysDisks.at(i).at(3).toInt(&ok) - safeBuf; 
     684          return (sysDisks.at(i).at(3).toInt(&ok) - safeBuf); 
    671685        else 
    672686          return -1; 
  • src-qt5/xtrafiles/local/share/pcbsd/scripts/move-vbox.sh

    rce3ccfc r7d17f07  
    33# 1 = USER 
    44# 2 = HOME 
     5 
     6# Move an existing old VM dirs in users home 
     7if [ -d "${2}/VirtualBox VMs" ] ; then 
     8   mv "${2}/VirtualBox VMs" "${2}/VirtualBox VMs.old" 
     9fi 
     10if [ -d "${2}/.VirtualBox" ] ; then 
     11   mv "${2}/.VirtualBox" "${2}/.VirtualBox.old" 
     12fi 
     13if [ -d "${2}/.config/VirtualBox" ] ; then 
     14   mv "${2}/.config/VirtualBox" "${2}/.config/VirtualBox.old" 
     15fi 
    516 
    617# Helper script to move VBOX from /root -> /usr/home/FOO 
     
    1223  mv "/root/VirtualBox VMs" "${2}/VirtualBox VMs" | zenity --text "Moving VMs... Please wait..." --progress --pulsate --auto-close --no-cancel 
    1324fi 
    14 chown -R "${1}:${1}" "${2}/VirtualBox VMs" 
     25 
     26# Fix the snapshots / paths in vbox files 
     27cd "${2}/VirtualBox VMs" 
     28if [ $? -eq 0 ] ; then 
     29  for vfile in `find . | grep \.vbox$` 
     30  do 
     31    sed -i '' "s|/root/|${2}/|g" "${vfile}" 
     32  done 
     33  chown -R "${1}:${1}" "${2}/VirtualBox VMs" 
     34fi 
    1535 
    1636if [ -d "/root/.VirtualBox" ] ; then 
  • src-qt5/xtrafiles/local/share/pcbsd/scripts/vbox-check

    r38676fa r7d17f07  
    2727         fi 
    2828      elif [ -e "/usr/local/bin/zenity" ] ; then 
    29          zenity --question "Found old root VirtualBox profile / VMs! Migrate them to your user account now?" 
     29         zenity --question --text="Found old root VirtualBox profile / VMs! Migrate them to your user account now?" 
    3030         if [ $? -eq 0 ] ; then 
    3131            migrate_vms 
  • src-sh/pcbsd-utils/pc-extractoverlay/pc-extractoverlay

    rec3a71e rb80f78d  
    168168    fi 
    169169 
     170    # Copy over the default rc.conf.pcbsd file 
     171    cp /usr/local/share/pcbsd/conf/rc.conf.pcbsd /etc/rc.conf.pcbsd 
     172 
     173    # If the default firewall rules are missing, create them now 
     174    if [ ! -e "/etc/ipfw.rules" ] ; then 
     175       /local/share/pcbsd/scripts/reset-firewall 
     176    fi 
     177 
    170178    # Check if we need to enable openntpd 
    171179    grep -q "openntpd" /etc/rc.conf.pcbsd 
     
    180188    if [ ! -e "/usr/local/etc/ntpd.conf" ] ; then 
    181189       cp /usr/local/share/pcbsd/conf/ntpd.conf /usr/local/etc/ntpd.conf 
     190    fi 
     191 
     192    # Make sure we have a default smb4.conf 
     193    if [ ! -e "/usr/local/etc/smb4.conf" ] ; then 
     194       cp /usr/local/share/pcbsd/conf/smb4.conf /usr/local/etc/smb4.conf 
    182195    fi 
    183196  fi # End of not for jails section 
  • src-sh/pcbsd-utils/pc-extractoverlay/ports-overlay/usr/local/etc/luminaDesktop.conf

    rff3202a r59a894be  
    2121#THEME SETTINGS 
    2222#theme.themefile=<file path> #Absolute path to the theme template file to use (disable for Lumina-Default) 
    23 #theme.colorfile=<file path> #Absolute path to the color spec file to use for theming 
     23theme.colorfile=PCBSD10-Default #Absolute path to the color spec file to use for theming 
    2424theme.iconset=oxygen #Name of the icon theme to use 
    2525theme.font=Arial #Name of the font family to use 
  • src-sh/pcbsd-utils/pc-sysinstall/backend/functions-bsdlabel.sh

    r479b104 r8228d311  
    266266  elif [ "${_pType}" = "apm" ] ; then 
    267267    CURPART="3" 
     268  elif [ "${_pType}" = "freembr" ] ; then 
     269    # If we are creating a new MBR primary partition, lets do it now 
     270    CURPART="${_sNum}" 
     271    PARTLETTER="a" 
     272    if [ "$CURPART" = "1" ] ; then 
     273      rc_halt "gpart add -b 2048 -a 4k -t freebsd -i ${CURPART} ${_pDISK}" 
     274    else 
     275      rc_halt "gpart add -a 4k -t freebsd -i ${CURPART} ${_pDISK}" 
     276    fi 
     277    rc_halt "gpart create -s BSD ${_wSlice}" 
     278    _pType="mbr" 
     279  elif [ "${_pType}" = "freegpt" ] ; then 
     280    CURPART="${_sNum}" 
     281    _pType="gpt" 
    268282  else 
    269283    PARTLETTER="a" 
     
    720734   
    721735  # Set WRKSLICE based upon format we are using 
    722   if [ "$type" = "mbr" ] ; then 
     736  if [ "$type" = "mbr" -o "$type" = "freembr" ] ; then 
    723737    wrkslice="${diskid}s${slicenum}" 
    724738  fi 
     
    726740    wrkslice="${diskid}s${slicenum}" 
    727741  fi 
    728   if [ "$type" = "gpt" -o "$type" = "gptslice" ] ; then 
     742  if [ "$type" = "gpt" -o "$type" = "gptslice" -o "$type" = "freegpt" ] ; then 
    729743    wrkslice="${diskid}p${slicenum}" 
    730744  fi 
  • src-sh/pcbsd-utils/pc-sysinstall/backend/functions-disk.sh

    r994f622 r8228d311  
    433433        fi 
    434434 
    435         if [ $LASTSLICE -gt 4 ] 
    436         then 
    437           exit_err "ERROR: BSD only supports primary partitions, and there are none available on $DISK" 
    438         fi 
    439  
    440435      fi 
    441436    fi 
     
    903898  slicenum="${SLICENUM}"  
    904899 
    905   # Working on the first slice, make sure we have MBR setup 
     900  # Working on the first slice, make sure we have GPT setup 
    906901  gpart show ${DISK} >/dev/null 2>/dev/null 
    907902  if [ $? -ne 0 -a "$SLICENUM" = "1" ] ; then 
    908     echo_log "Initializing disk, no existing MBR setup" 
    909     rc_halt "gpart create -s mbr ${DISK}" 
    910   fi 
    911  
    912   # Install new partition setup 
    913   echo_log "Running gpart on ${DISK}" 
    914   rc_halt "gpart add -a 4k -t freebsd -i ${slicenum} ${DISK}" 
    915   sleep 2 
    916    
    917   echo_log "Cleaning up $slice" 
    918   rc_halt "dd if=/dev/zero of=${slice} count=1024" 
    919  
    920   sleep 1 
     903    echo_log "Initializing disk, no existing GPT setup" 
     904    rc_halt "gpart create -s gpt ${DISK}" 
     905  fi 
     906 
     907  gpart show ${DISK} | head -n 1 | grep -q MBR 
     908  if [ $? -eq 0 ] ; then 
     909     tag="freembr" 
     910  else 
     911     tag="freegpt" 
     912  fi 
     913 
     914  # Check if on MBR and have >4 slices 
     915  if [ "$tag" = "freembr" -a $SLICENUM -gt 4 ]; then 
     916      exit_err "ERROR: BSD only supports 4 MBR primary partitions, and there are none available on $DISK" 
     917  fi 
    921918 
    922919  if [ "${BMANAGER}" = "BSD" ]; then 
     
    928925  fi 
    929926 
    930   slice=`echo "${DISK}:${SLICENUM}:mbr" | sed 's|/|-|g'` 
     927  slice=`echo "${DISK}:${SLICENUM}:${tag}" | sed 's|/|-|g'` 
    931928  # Lets save our slice, so we know what to look for in the config file later on 
    932929  if [ -z "$WORKINGSLICES" ] 
  • src-sh/pcbsd-utils/pc-updatemanager/pc-updatemanager

    r7abc835 rb487d03  
    10421042  echo_log "Verifying / fetching packages for ports-mgmt/pkg - $PKGFILENAME" 
    10431043  echo "Verifying / fetching packages for ports-mgmt/pkg - $PKGFILENAME" >> ${PKGUPGRADELOG} 
    1044   ${PKG_CMD} ${PKG_CFLAG} ${PKG_FLAG} fetch -U -d -y ports-mgmt/pkg >/tmp/.pkgOut.$$ 2>/tmp/.pkgOut.$$ 
     1044  ${PKG_CMD} ${PKG_CFLAG} ${PKG_FLAG} fetch -U -d -y ports-mgmt/pkg 2>&1 | tee /tmp/.pkgOut.$$ 
    10451045  if [ $? -ne 0 ] ; then 
    1046      cat /tmp/.pkgOut.$$ 
    10471046     cat /tmp/.pkgOut.$$ >> $LOGOUT 
    10481047     cat /tmp/.pkgOut.$$ >> $PKGUPGRADELOG 
     
    10751074  echo_log "Verifying / fetching packages for ${SYSBASE} - $SYSBASEFILENAME" 
    10761075  echo "Verifying / fetching packages for ${SYSBASE} - $SYSBASEFILENAME" >> ${PKGUPGRADELOG} 
    1077   ${PKG_CMD} ${PKG_CFLAG} ${PKG_FLAG} fetch -U -d -y ${SYSBASE} >/tmp/.pkgOut.$$ 2>/tmp/.pkgOut.$$ 
     1076  ${PKG_CMD} ${PKG_CFLAG} ${PKG_FLAG} fetch -U -d -y ${SYSBASE} > 2>&1 | tee /tmp/.pkgOut.$$ 
    10781077  if [ $? -ne 0 ] ; then 
    1079      cat /tmp/.pkgOut.$$ 
    10801078     cat /tmp/.pkgOut.$$ >> $LOGOUT 
    10811079     cat /tmp/.pkgOut.$$ >> $PKGUPGRADELOG 
     
    11211119    echo_log "Verifying / fetching packages for ${pkgOrigin} - $FETCHFILENAME" 
    11221120    echo "Verifying / fetching packages for ${pkgOrigin} - $FETCHFILENAME" >> ${PKGUPGRADELOG} 
    1123     ${PKG_CMD} ${PKG_CFLAG} ${PKG_FLAG} fetch -U -d -y $pkgOrigin >/tmp/.pkgOut.$$ 2>/tmp/.pkgOut.$$ 
     1121    ${PKG_CMD} ${PKG_CFLAG} ${PKG_FLAG} fetch -U -d -y $pkgOrigin 2>&1 | tee /tmp/.pkgOut.$$ 
    11241122    if [ $? -ne 0 ] ; then 
    11251123       echo_log "*****" >> $PKGUPGRADELOG 
    11261124       echo_log "Failed fetching: $pkgOrigin" 
    1127        cat /tmp/.pkgOut.$$ 
    11281125       cat /tmp/.pkgOut.$$ >> $LOGOUT 
    11291126       echo_log "*****" 
  • src-sh/pcbsd-utils/port-files/pkg-plist

    r672739d r2042a72  
    111111share/pcbsd/conf/loader.conf.trueos 
    112112share/pcbsd/conf/ntpd.conf 
     113share/pcbsd/conf/rc.conf.pcbsd 
     114share/pcbsd/conf/smb4.conf 
    113115share/pcbsd/distfiles/desktop-overlay.txz 
    114116share/pcbsd/distfiles/port-overlay.txz 
  • src-sh/pcbsd-utils/xtrafiles/local/share/pcbsd/conf/loader.conf.pcbsd

    r2f7f50f4 r0840f01  
    5858# If you use the lagg interface you may want to set this in /boot/loader.conf 
    5959#net.inet6.ip6.auto_linklocal="0" 
     60 
     61# Set ipfw to default accept 
     62net.inet.ip.fw.default_to_accept="1" 
     63 
     64# Allow more than one pass through firewall (for pipes, etc) 
     65net.inet.ip.fw.one_pass=0 
  • src-sh/pcbsd-utils/xtrafiles/local/share/pcbsd/conf/loader.conf.trueos

    r2e1ecf0 r0840f01  
    1212kern.geom.label.disk_ident.enable="0" 
    1313kern.geom.label.ufsid.enable="0" 
     14 
     15# Set ipfw to default accept 
     16net.inet.ip.fw.default_to_accept="1" 
     17 
     18# Allow more than one pass through firewall (for pipes, etc) 
     19net.inet.ip.fw.one_pass=0 
  • src-sh/pcbsd-utils/xtrafiles/local/share/pcbsd/scripts/reset-firewall

    rea12c5c rc5a36d0  
    11#!/bin/sh 
    2 # Revision 0.2 Mon Mar 03 12:29:00 EST 2008 
    3 # 
    4 # Copyright (c) 2006 Dominique Goncalves 
    5 # Copyright (c) 2006 Andrei Kolu  
    6 # Modified 2008 Kris Moore (PC-BSD Software) 
    7 # 
    8 # See COPYING for licence terms. 
     2# Copyright (c) 2015 Kris Moore (iXsystems / PC-BSD) 
     3# License: BSD 
    94 
    10 # 06-03-2008 - Kris Moore (PC-BSD Software) 
    11 # Added option to open specific ports by passing variables 
     5rules="/etc/ipfw.rules" 
    126 
    13 pf_rules="/etc/pf.conf" 
    14  
    15 if [ -e "$pf_rules" ] ; then 
    16    echo "${pf_rules} already exists!" 
     7if [ -e "$rules" ] ; then 
     8   echo "${rules} already exists!" 
    179   echo "Remove this file first to re-generate ruleset" 
    1810   exit 1 
    1911fi 
    2012 
    21 echo "Creating $pf_rules." 
    22 echo "set skip on lo0" > $pf_rules 
    23 echo "set block-policy return" >> $pf_rules 
    24 echo "scrub in all" >> $pf_rules 
    25 echo "antispoof quick for lo0 inet" >> $pf_rules 
    26 # block anything coming from source we have no back routes for 
    27 echo "block in from no-route to any" >> $pf_rules 
     13echo "Creating $rules." 
    2814 
    29 echo "# Block all other incoming" >> $pf_rules 
    30 echo "block in log" >> $pf_rules 
     15cat >${rules} << EOF 
     16#!/bin/sh 
     17# To re-apply rules, you can run "sh ${rules}" 
    3118 
    32 echo ''  >> $pf_rules 
    33 echo '# Allow all outgoing traffic' >> $pf_rules 
    34 echo "pass out keep state" >> $pf_rules 
     19# Flush out the list before we begin. 
     20ipfw -q -f flush 
    3521 
    36 # Deny all from our blacklist 
    37 echo ''  >> $pf_rules 
    38 echo '# Block blacklist'  >> $pf_rules 
    39 echo 'table <blacklist> persist file "/etc/blacklist"'  >> $pf_rules 
    40 echo "block from <blacklist> to any" >> $pf_rules 
     22# Set rules command prefix 
     23cmd="ipfw -q add" 
    4124 
    42 echo ''  >> $pf_rules 
    43 echo "# Enable ICMP for IPv4 IPv6" >> $pf_rules 
    44 echo "pass proto icmp all" >> $pf_rules 
    45 echo "pass proto icmp6 all" >> $pf_rules 
    46 ############################################################# 
     25# No restrictions on loopback 
     26#################################################################### 
     27\$cmd 00020 allow all from any to any via lo0 
     28#################################################################### 
    4729 
    48 echo ''  >> $pf_rules 
    49 echo '# Nic Specific Rules'  >> $pf_rules 
     30# Catch spoofing from outside 
     31#################################################################### 
     32\$cmd 00025 deny ip from any to any not antispoof in 
     33#################################################################### 
    5034 
    51 DEVLIST=`ifconfig -l` 
     35# Check the state of packets 
     36#################################################################### 
     37\$cmd 00050 check-state 
     38\$cmd 00100 allow tcp from any to any established 
     39#################################################################### 
    5240 
    53 echo ${DEVLIST} | grep -q "lagg0" 
    54 if [ $? -eq 0 ] ; then DEVLIST="${DEVLIST} lagg0"; fi 
     41# Allow all outgoing packets 
     42#################################################################### 
     43\$cmd 00150 allow ip from any to any out keep-state 
     44#################################################################### 
    5545 
    56 echo ${DEVLIST} | grep -q -e "iwn0" -e "ath0" -e "bwn0" -e "bwi0" -e "an0" -e "mwl0" -e "ural0" -e "ral0" -e "zyd0" 
    57 if [ $? -eq 0 ] ; then DEVLIST="${DEVLIST} wlan0"; fi 
     46# Allow specific ports IN now 
     47# Add items to /etc/ipfw.openports in the format 
     48# {tcp|udp} <portnum> 
     49#################################################################### 
     50nextnum=200 
     51if [ -e "/etc/ipfw.openports" ] ; then 
     52  while read line 
     53  do 
     54    echo \$line | grep -q "^#" 
     55    if [ \$? -eq 0 ] ; then continue ; fi 
     56    proto="\`echo \$line | awk '{print \$1}'\`" 
     57    port="\`echo \$line | awk '{print \$2}'\`" 
     58    if [ -z "\$proto" -o -z "\$port" ] ; then continue ; fi 
     59    \$cmd \$nextnum allow \$proto from any to me \$port in keep-state 
     60    nextnum=\`expr \$nextnum + 1\` 
     61  done < /etc/ipfw.openports 
     62fi 
     63#################################################################### 
    5864 
    59 for inf in ${DEVLIST} ; do 
    60   if `echo $inf | egrep -v 'ath|bwn|bwi|an|mwl|ural|ral|zyd|iwn|lo|plip|gif|tun|pfsync' 1>/dev/null` ; then 
     65# Deny all other incoming troublemakers 
     66#################################################################### 
     67\$cmd 01500 deny log all from any to any 
     68#################################################################### 
    6169 
    62   # Ports from 49152 to 65535 is needed for SMB and other connectivity 
    63   echo "pass in quick on $inf proto {tcp,udp} from any to any port 49152:65535 keep state" >> $pf_rules 
    64  
    65   # Setup the default UDP entries 
    66   echo "pass in quick on $inf proto udp from any to ($inf) port 137 keep state" >> $pf_rules 
    67   echo "pass in quick on $inf proto udp from any to ($inf) port 138 keep state" >> $pf_rules 
    68   echo "pass in quick on $inf proto udp from any to ($inf) port 111 keep state" >> $pf_rules 
    69   echo "pass in quick on $inf proto udp from any to ($inf) port 1110 keep state" >> $pf_rules 
    70   echo "pass in quick on $inf proto udp from any to ($inf) port 2049 keep state" >> $pf_rules 
    71   echo "pass in quick on $inf proto udp from any to ($inf) port 4045 keep state" >> $pf_rules 
    72   echo "pass in quick on $inf proto udp from any to ($inf) port 5353 keep state" >> $pf_rules 
    73   echo "pass in quick on $inf proto udp from any to 224.0.0.251/32 port 5353 keep state" >> $pf_rules 
    74  
    75  
    76   # Setup the default TCP entries 
    77   echo "pass in quick on $inf proto tcp from any to ($inf) port 445 keep state" >> $pf_rules 
    78   echo "pass in quick on $inf proto tcp from any to ($inf) port 137 keep state" >> $pf_rules 
    79   echo "pass in quick on $inf proto tcp from any to ($inf) port 139 keep state" >> $pf_rules 
    80   echo "pass in quick on $inf proto tcp from any to ($inf) port 111 keep state" >> $pf_rules 
    81   echo "pass in quick on $inf proto tcp from any to ($inf) port 1110 keep state" >> $pf_rules 
    82   echo "pass in quick on $inf proto tcp from any to ($inf) port 4045 keep state" >> $pf_rules 
    83   echo "pass in quick on $inf proto tcp from any to ($inf) port 5353 keep state" >> $pf_rules 
    84  
    85  
    86     # Check if there are any extra ports to open and do so 
    87     if [ ! -z "$@" ] 
    88     then 
    89        for port in "$@" 
    90        do 
    91          echo "pass in quick on $inf proto udp from any to ($inf) port ${port} keep state" >> $pf_rules 
    92          echo "pass in quick on $inf proto tcp from any to ($inf) port ${port} keep state" >> $pf_rules 
    93        done 
    94     fi 
    95                          
    96   fi 
    97 done 
    98  
     70EOF 
  • src-qt5/life-preserver/lp-gui/LPBackend.cpp

    r3e08ed8 r7fd15165  
    101101  for(int i=2; i<out.length(); i++){ //first 2 lines are headers 
    102102    //Format: <dataset> -> <replicationTarget> - <lastsnapshot | NONE> - <lastreplication | NONE> 
    103     if(out[i].isEmpty()){ continue; } 
     103    if(out[i].isEmpty() || !out[i].contains(" -> ") ){ continue; } 
    104104    QString ds  = out[i].section(" -> ",0,0).simplified(); 
    105105    QString target = out[i].section(" -> ",1,1).section(" - ",0,0).simplified(); 
  • src-qt5/life-preserver/lp-tray/LPWatcher.cpp

    r049c90f r7fd15165  
    176176    //Now decide what to do/show because of the log message 
    177177    //qDebug() << "New Log Message:" << log; 
    178     if(message.contains("creating snapshot")){ 
     178    if(message.contains("creating snapshot", Qt::CaseInsensitive)){ 
    179179      dev = message.section(" ",-1).simplified(); 
    180180      //Setup the status of the message 
     
    186186      LOGS.insert(15, time); // time only 
    187187      if(!quiet){ emit MessageAvailable("message"); } 
    188     }else if(message.contains("starting replication")){ 
     188    }else if(message.contains("starting replication", Qt::CaseInsensitive)){ 
    189189      //Setup the file watcher for this new log file 
    190190      FILE_REPLICATION = dev; 
    191       dev = message.section(" ",5,5,QString::SectionSkipEmpty); 
     191      dev = message.section(" ",-1,QString::SectionSkipEmpty); 
    192192      //Make sure the device is currently setup for replication 
    193193      if( !reppools.contains(dev) ){ FILE_REPLICATION.clear(); continue; } 
     
    204204        if(!quiet){ emit MessageAvailable("replication"); } 
    205205      } 
    206     }else if(message.contains("finished replication task")){ 
     206    }else if(message.contains("finished replication task", Qt::CaseInsensitive)){ 
    207207      stopRepFileWatcher(); 
    208       dev = message.section(" ",-3, -3).simplified(); 
     208      dev = message.section(" -> ",0,0).section(" ",-1).simplified(); 
    209209      //Make sure the device is currently setup for replication 
    210210      if( reppools.contains(dev) ){ 
     
    229229        if(!quiet){ emit MessageAvailable(""); } 
    230230      } 
    231     }else if( message.contains("FAILED replication") ){ 
     231    }else if( message.contains("FAILED replication", Qt::CaseInsensitive) ){ 
    232232      stopRepFileWatcher(); 
    233233      //Now set the status of the process 
    234       dev = message.section(" ",-5, -5).simplified(); 
     234      dev = message.section(" -> ",0,0).section(" ",-1).simplified(); 
    235235      //Make sure the device is currently setup for replication 
    236236      if( reppools.contains(dev) ){ 
Note: See TracChangeset for help on using the changeset viewer.