Changeset 8238e3c


Ignore:
Timestamp:
04/16/15 08:07:12 (5 weeks ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.1.2
Children:
9a66c62, 60651c6
Parents:
9b6bd02 (diff), e481550e (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
9 edited

Legend:

Unmodified
Added
Removed
  • src-sh/pcbsd-utils/pc-updatemanager/Makefile

    rdd41234 rebb92d9  
    5252        -$(INSTALL_DIR) conf $(INSTALL_ROOT)$(PREFIX)/share/pcbsd/pc-updatemanager/ 
    5353 
     54install_pcupdated: first FORCE 
     55        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/etc/pcupdate.d/ || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/etc/pcupdate.d/ 
     56        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/etc/pcupdate.d/pre || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/etc/pcupdate.d/pre 
     57        @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)$(PREFIX)/etc/pcupdate.d/post || $(MKDIR) $(INSTALL_ROOT)$(PREFIX)/etc/pcupdate.d/post 
     58        -$(INSTALL_FILE) pcupdate.d/pre/README $(INSTALL_ROOT)$(PREFIX)/etc/pcupdate.d/pre/README 
     59        -$(INSTALL_FILE) pcupdate.d/post/README $(INSTALL_ROOT)$(PREFIX)/etc/pcupdate.d/post/README 
    5460 
    5561uninstall_conf:  FORCE 
     
    5864 
    5965 
    60 install:  install_scripts install_dochmod install_conf FORCE 
     66install:  install_scripts install_dochmod install_conf install_pcupdated FORCE 
    6167 
    6268uninstall: uninstall_scripts uninstall_conf  FORCE 
  • src-sh/pcbsd-utils/pc-updatemanager/pc-updatemanager

    r5fcb349 rebb92d9  
    4949if [ ! -d "${DOWNLOADDIR}" ]; then mkdir -p ${DOWNLOADDIR}; fi 
    5050 
     51# Location for custom scripts for upgrades 
     52UPDATEDOTD="/usr/local/etc/pcupdate.d" 
    5153 
    5254# Trigger File for Tray Application 
     
    785787    build_pkg_list 
    786788    dl_pkgs 
     789    run_update_pre "PKG" 
     790  else 
     791    run_update_pre "SECURITY" 
    787792  fi 
    788793 
     
    805810 
    806811  start_syscache 
     812  if [ "$doPkgUpdates" = "YES" ] ; then 
     813    run_update_post "PKG" 
     814  else 
     815    run_update_post "SECURITY" 
     816  fi 
    807817 
    808818  touch_reboot 
     
    834844 
    835845  kill_syscache 
     846  run_update_pre "PKG" 
    836847  mk_pkg_conf 
    837848  build_pkg_list 
     
    849860 
    850861  start_syscache 
     862  run_update_post "PKG" 
    851863 
    852864  touch_reboot 
     
    872884 
    873885  kill_syscache 
     886  run_update_pre "SYSTEM" 
    874887  mk_pkg_conf 
    875888  build_pkg_list 
     
    887900 
    888901  start_syscache 
     902  run_update_post "SYSTEM" 
    889903 
    890904  touch_reboot 
     
    14571471    echo "pc-updatemanager: `date`" > $LOGOUT 
    14581472  fi 
     1473} 
     1474 
     1475run_update_pre() 
     1476{ 
     1477  UPDATEDOTDPRE="${UPDATEDOTD}/pre" 
     1478  if [ ! -d "${UPDATEDOTDPRE}" ] ; then return 0; fi 
     1479 
     1480  for pre in `ls ${UPDATEDOTDPRE}` 
     1481  do 
     1482    if [ "$pre" = "README" ] ; then continue ; fi 
     1483 
     1484    echo "Running pre-update script: $pre" 
     1485    sh ${UPDATEDOTDPRE}/${pre} "$1" 
     1486    if [ $? -ne 0 ] ; then 
     1487       exit_err "Failed running pre-update script: $pre" 
     1488    fi 
     1489  done 
     1490} 
     1491 
     1492run_update_post() 
     1493{ 
     1494  UPDATEDOTDPOST="${UPDATEDOTD}/post" 
     1495  if [ ! -d "${UPDATEDOTDPOST}" ] ; then return 0; fi 
     1496 
     1497  for post in `ls ${UPDATEDOTDPOST}` 
     1498  do 
     1499    if [ "$POST" = "README" ] ; then continue ; fi 
     1500 
     1501    echo "Running post-update script: $post" 
     1502    sh ${UPDATEDOTDPRE}/${post} "$1" 
     1503    if [ $? -ne 0 ] ; then 
     1504       echo "WARNING: Failed running post-update script: $post" 
     1505    fi 
     1506  done 
    14591507} 
    14601508 
  • src-sh/pcbsd-utils/port-files/pkg-plist

    rf07996b rebb92d9  
    208208etc/pc-activedirectory.conf 
    209209etc/pc-ldap.conf 
     210etc/pcupdate.d/post/README 
     211etc/pcupdate.d/pre/README 
    210212etc/rc.activedirectory 
    211213etc/rc.ldap 
  • src-qt5/xtrafiles/local/etc/xdg/autostart/pcbsd-life-preserver.desktop

    rfadff3b r9b6bd02  
    99GenericName= 
    1010X-GNOME-Autostart-Phase=Applications 
     11X-MATE-Autostart-Phase=Applications 
  • src-qt5/xtrafiles/local/etc/xdg/autostart/pcbsd-mixer.desktop

    rfadff3b r9b6bd02  
    1010NotShowIn=Lumina 
    1111X-GNOME-Autostart-Phase=Applications 
     12X-MATE-Autostart-Phase=Applications 
  • src-qt5/xtrafiles/local/etc/xdg/autostart/pcbsd-mounttray.desktop

    rfadff3b r9b6bd02  
    99GenericName= 
    1010X-GNOME-Autostart-Phase=Applications 
     11X-MATE-Autostart-Phase=Applications 
  • src-qt5/xtrafiles/local/etc/xdg/autostart/pcbsd-nettray.desktop

    rfadff3b r9b6bd02  
    99GenericName= 
    1010X-GNOME-Autostart-Phase=Applications 
     11X-MATE-Autostart-Phase=Applications 
  • src-qt5/xtrafiles/local/etc/xdg/autostart/pcbsd-updater.desktop

    rfadff3b r9b6bd02  
    99GenericName= 
    1010X-GNOME-Autostart-Phase=Applications 
     11X-MATE-Autostart-Phase=Applications 
  • src-qt5/xtrafiles/local/etc/xdg/autostart/pcbsd-welcome.desktop

    rfadff3b r9b6bd02  
    99GenericName= 
    1010X-GNOME-Autostart-Phase=Applications 
     11X-MATE-Autostart-Phase=Applications 
Note: See TracChangeset for help on using the changeset viewer.