Changeset 4212d03


Ignore:
Timestamp:
01/26/15 10:36:17 (7 months ago)
Author:
Kris Moore <kris@…>
Branches:
releng/10.1.1
Children:
227c4d4
Parents:
2594c28
git-author:
Kris Moore <kris@…> (01/26/15 10:34:49)
git-committer:
Kris Moore <kris@…> (01/26/15 10:36:17)
Message:

Move the loader.conf.{pcbsd|trueos} files to the package proper, then
add a hook to pc-extractoverlay ports to figure out which to copy.

This makes sure that systems upgrading from earlier get new versions
of loader.conf.FOO installed during upgrades

Location:
src-sh/pcbsd-utils
Files:
3 edited
2 moved

Legend:

Unmodified
Added
Removed
  • src-sh/pcbsd-utils/pc-extractoverlay/pc-extractoverlay

    re6b7b7d r4212d03  
    151151       if [ $? -ne 0 ]; then 
    152152         echo "pcsysconfig_enable=\"YES\"" >> /etc/rc.conf 
     153       fi 
     154    fi 
     155 
     156    # Copy over the default loader.conf file 
     157    if [ -e "/boot/loader.conf.pcbsd" ] ; then 
     158       cp /usr/local/share/pcbsd/conf/loader.conf.pcbsd /boot/loader.conf.pcbsd 
     159    elif [ -e "/boot/loader.conf.trueos" ] ; then 
     160       cp /usr/local/share/pcbsd/conf/loader.conf.trueos /boot/loader.conf.trueos 
     161    else 
     162       # No default loader.conf? Lets figure out which to copy 
     163       if [ -e "/etc/defaults/pcbsd" ] ; then 
     164         cp /usr/local/share/pcbsd/conf/loader.conf.pcbsd /boot/loader.conf.pcbsd 
     165       else 
     166         cp /usr/local/share/pcbsd/conf/loader.conf.trueos /boot/loader.conf.trueos 
    153167       fi 
    154168    fi 
  • src-sh/pcbsd-utils/port-files/pkg-plist

    r055ef53 r4212d03  
    107107share/pcbsd/conf/server-excludes 
    108108share/pcbsd/conf/linux-compat-version 
     109share/pcbsd/conf/loader.conf.pcbsd 
     110share/pcbsd/conf/loader.conf.trueos 
    109111share/pcbsd/distfiles/desktop-overlay.txz 
    110112share/pcbsd/distfiles/port-overlay.txz 
  • src-sh/pcbsd-utils/xtrafiles/local/share/pcbsd/scripts/sys-init.sh

    r82179bf r4212d03  
    2727# Update XDG menus 
    2828/usr/local/bin/pc-xdgutil updatemenu 
    29  
    30 # Update ports overlay files 
    31 /usr/local/bin/pc-extractoverlay ports 
    3229 
    3330# Add our notice to top of loader.conf 
     
    155152  sed -i '' 's|remote = false|remote = true|g' /usr/local/etc/appcafe.conf 
    156153fi 
     154 
     155# Update ports overlay files 
     156/usr/local/bin/pc-extractoverlay ports 
     157 
Note: See TracChangeset for help on using the changeset viewer.