Changeset 3551066


Ignore:
Timestamp:
07/15/14 14:08:55 (14 months ago)
Author:
Josh <joshms@…>
Branches:
master, enter/10, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2, releng/10.2, stable/10
Children:
414442d
Parents:
9461624 (diff), ac59194 (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 git://github.com/pcbsd/pcbsd

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • build-files/ports-overlay/misc/pcbsd-meta-kde/Makefile

    rd6bf18f rac59194  
    3030                plasma-applet-panelspacer>=0:${PORTSDIR}/deskutils/plasma-applet-panelspacer \ 
    3131                plasma-applet-simpleweatherforecast>=0:${PORTSDIR}/deskutils/plasma-applet-simpleweatherforecast \ 
    32                 kde4-windeco-nitrogen>=0:${PORTSDIR}/x11-themes/kde4-windeco-nitrogen \ 
    3332                kde4-style-qtcurve>=0:${PORTSDIR}/x11-themes/qtcurve-kde4 \ 
    3433                lirc>=0:${PORTSDIR}/comms/lirc \ 
  • src-sh/libsh/functions.sh

    r234414e r04aeb2a  
    824824     # Re-install GRUB on this disk 
    825825     echo "Installing GRUB to $disk" >&2 
    826      grub-install /dev/${disk} 
     826     grub-install --modules='zfs part_gpt part_bsd geli' /dev/${disk} 
    827827  done 
    828828  return 0 
  • src-sh/lpreserver/backend/functions.sh

    r5969632 r04aeb2a  
    519519   # Lastly we need to stamp GRUB 
    520520   echo "Stamping GRUB on: $disk" 
    521    rc_halt_s "grub-install --force /dev/${disk}" 
     521   rc_halt_s "grub-install --modules='zfs part_gpt part_bsd geli' --force /dev/${disk}" 
    522522 
    523523   echo "Added $disk ($aDev) to zpool $pool. Resilver will begin automatically." 
  • src-sh/pc-sysinstall/backend/functions-unmount.sh

    r75eb09a r04aeb2a  
    263263 
    264264    # Stamp GRUB now 
    265     rc_halt "chroot ${FSMNT} grub-install --force $gDisk" 
     265    rc_halt "chroot ${FSMNT} grub-install --modules='zfs part_gpt part_bsd geli' --force $gDisk" 
    266266  done < ${TMPDIR}/.grub-install 
    267267 
  • src-sh/pc-installdialog/pc-installdialog.sh

    r1fff3bab r9461624  
    398398 
    399399  if [ -z "$ANS" ] ; then 
    400      echo "No password specified!  GELI encryption is currently disabled.  Please run the wizard again to setup GELI encryption!"; rtn 
     400     echo "No password specified!  GELI encryption is currently disabled." >> /tmp/.GELIinfo.$$ 
     401     echo "Please run the wizard again to setup GELI encryption!" >> /tmp/.GELIinfo.$$ 
    401402     USINGGELI="NO" 
     403     dialog --tailbox /tmp/.GELIinfo.$$ 10 80 
     404     rm /tmp/.GELIinfo.$$ 
    402405     return 
    403406  fi 
     
    406409  get_dlg_ans "--inputbox 'Enter password (again)' 8 40" 
    407410  if [ -z "$ANS" ] ; then 
    408      echo "No password specified!  GELI encryption is currently disabled.  Please run the wizard again to setup GELI encryption!"; rtn 
     411     echo "No password specified!  GELI encryption is currently disabled." >> /tmp/.GELIinfo.$$ 
     412     echo "Please run the wizard again to setup GELI encryption!" >> /tmp/.GELIinfo.$$ 
    409413     USINGGELI="NO" 
     414     dialog --tailbox /tmp/.GELIinfo.$$ 10 80 
     415     rm /tmp/.GELIinfo.$$ 
    410416     return 
    411417  fi 
    412418      
    413419  if [ "$GELIPASS" != "$ANS" ]; then 
    414      echo "ERROR: Password mismatch! GELI encryption is currently disabled.  Please run the wizard again to setup GELI encryption!"; 
    415      rtn 
     420     echo "ERROR: Password mismatch! GELI encryption is currently disabled." >> /tmp/.GELIinfo.$$ 
     421     echo "Please run the wizard again to setup GELI encryption!" >> /tmp/.GELIinfo.$$ 
    416422     USINGGELI="NO" 
     423     dialog --tailbox /tmp/.GELIinfo.$$ 10 80 
     424     rm /tmp/.GELIinfo.$$ 
    417425     return 
    418426  fi 
Note: See TracChangeset for help on using the changeset viewer.