Changeset 75486ff


Ignore:
Timestamp:
03/24/15 12:44:25 (4 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, enter/10, releng/10.1.2
Children:
f5baa83, a2584c0
Parents:
d70faf7 (diff), a5ba06e (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:
5 edited

Legend:

Unmodified
Added
Removed
  • overlays/install-overlay/root/functions.sh

    r1d8a9d1 rf770d16  
    172172 
    173173  # Now try to mount the root dataset 
    174   mount -t zfs ${mypool}/ROOT/default /mnt 
    175   if [ $? -ne 0 ] ; then 
    176      lastRoot=`zfs list -H | grep "$mypool/ROOT/" | awk '{print $1}' | tail -n 1` 
    177      mount -t zfs ${lastRoot} /mnt 
    178      if [ $? -ne 0 ] ; then 
    179        echo "Failed to mount root dataset! Please manually mount to /mnt" 
    180        rtn 
    181        return 1 
    182      fi 
     174  lastRoot=`zfs list -H | grep "$mypool/ROOT/" | awk '{print $1}' | tail -n 1` 
     175  mount -t zfs ${lastRoot} /mnt 
     176  if [ $? -ne 0 ] ; then 
     177    echo "Failed to mount root dataset! Please manually mount to /mnt" 
     178    rtn 
     179    return 1 
    183180  fi 
    184181 
     
    189186     dset=`echo $line | awk '{print $1}'` 
    190187     lmnt=`echo $line | awk '{print $5}'` 
     188     if [ "$lmnt" = "none" -o "$lmnt" = "-" ] ; then continue ; fi 
     189 
    191190     mount -t zfs ${dset} /mnt/${lmnt} 
    192191     if [ $? -ne 0 ] ; then 
     
    219218restamp_grub_install() 
    220219{ 
     220  clear 
    221221  mount | grep -q "on /mnt" 
    222222  if [ $? -ne 0 ] ; then 
     
    233233  if [ $? -ne 0 ] ; then 
    234234     echo "Failed copying beadm.install..." 
     235     rtn 
    235236     return 1 
    236237  fi 
    237238 
    238239  # Run the grub restamp now 
    239   chroot /mnt restamp-grub 
    240   if [ $? -ne 0 ] ; then 
    241      echo "Failed running restamp-grub..." 
     240  chroot /mnt grub-mkconfig -o /boot/grub/grub.cfg 
     241  if [ $? -ne 0 ] ; then 
     242     echo "Failed running grub-mkconfig..." 
    242243     rm /mnt/root/beadm.install 
     244     rtn 
    243245     return 1 
    244246  fi 
     
    246248  # Remove installer version of beadm.install 
    247249  rm /mnt/root/beadm.install 
     250  rtn 
    248251 
    249252  return 0 
  • src-qt5/pc-cupscfg/pc-cupscfg

    r4e12d9a r44beba8  
    99  rm /usr/local/share/cups/model/HPLIP 
    1010fi 
     11user=$1 
    1112 
    1213system-config-printer 
  • src-qt5/pc-softweb/pc-softweb.pro

    rd2a8554 rd70faf7  
    9595 
    9696symlnk.path=/usr/local/bin 
    97 symlnk.extra=ln -fs /usr/local/bin/pc-softweb $(INSTALL_ROOT)/usr/local/bin/appcafe 
     97symlnk.extra=ln -fs /usr/local/bin/pc-softweb $(INSTALL_ROOT)/usr/local/bin/appcafe; ln -fs /usr/local/bin/pc-softweb $(INSTALL_ROOT)/usr/local/bin/pc-softwaremanager 
    9898 
    9999INSTALLS += target icons symlnk 
  • src-qt5/port-files/pkg-plist

    r2603afb r44beba8  
    2222bin/pc-fwmanager 
    2323bin/pc-servicemanager 
    24 bin/pc-softwaremanager 
    2524bin/pc-softweb 
    2625bin/pc-sysinstaller 
  • src-qt5/src-qt5.pro

    r6a6468e r44beba8  
    1616         pc-fwmanager \ 
    1717         pc-servicemanager \ 
    18          pc-softwaremanager \ 
    1918         pc-softweb \ 
    2019         pc-hwdetect \ 
Note: See TracChangeset for help on using the changeset viewer.