Changeset 5782 in /cluster/svnroot


Ignore:
Timestamp:
Sep 10, 2016 5:30:33 PM (4 years ago)
Author:
skylar
Message:

install ssh keys via after-install script re #979

Location:
bccd-ng/branches/skylar/bccd-3.4.0-build_ng
Files:
1 added
1 edited
1 copied
3 moved

Legend:

Unmodified
Added
Removed
  • bccd-ng/branches/skylar/bccd-3.4.0-build_ng/Makefile

    r5774 r5782  
    1919                -d environment-modules \
    2020                -x '*/.svn*' \
    21                 --before-install "$(WORKSPACE)/bin/bccd_deb_before_install" \
    22                 --after-remove "$(WORKSPACE)/bin/bccd_deb_after_remove"
     21                --before-install "$(WORKSPACE)/bin/deb/bccd_deb_before_install" \
     22                --after-remove "$(WORKSPACE)/bin/deb/bccd_deb_after_remove" \
     23                --after-install "$(WORKSPACE)/bin/deb/bccd_deb_after_install"
  • bccd-ng/branches/skylar/bccd-3.4.0-build_ng/bin/deb/bccd_deb_after_install

    r5780 r5782  
    55set -eo pipefail
    66
    7 CONFLICT_FILE="/etc/bccd/conflict_files.conf"
    8 CONFLICT_DIR="$(/usr/bin/dirname ${CONFLICT_FILE})"
    9 
    10 CONFLICT_FILES+=("/etc/X11/Xwrapper.config")
    11 CONFLICT_FILES+=("/etc/dhcp/dhclient.conf")
    12 CONFLICT_FILES+=("/etc/hosts.deny")
    13 CONFLICT_FILES+=("/etc/grub.d/10_linux")
    14 CONFLICT_FILES+=("/etc/grub.d/05_debian_theme")
    15 CONFLICT_FILES+=("/etc/profile")
    16 CONFLICT_FILES+=("/etc/adduser.conf")
    17 CONFLICT_FILES+=("/etc/default/rcS")
    18 CONFLICT_FILES+=("/etc/default/bluetooth")
    19 CONFLICT_FILES+=("/etc/sudoers")
    20 CONFLICT_FILES+=("/etc/hosts.allow")
    21 CONFLICT_FILES+=("/etc/init.d/ssh")
    22 
    23 if [ ! -d "${CONFLICT_DIR}" ]; then
    24     /bin/mkdir -p "${CONFLICT_DIR}"
    25 fi
    26 
    27 echo 'declare -a CONFLICT_FILES' > ${CONFLICT_FILE}
    28 
    29 for conflict_file in "${CONFLICT_FILES[@]}"; do
    30     /usr/bin/dpkg-divert --add --package bccd --rename ${conflict_file}
    31     echo 'CONFLICT_FILES+=("'"${conflict_file}"'")' >> ${CONFLICT_FILE}
     7# Install BCCD apt keys (#979)
     8for k in /etc/bccd/*; do
     9    /usr/bin/apt-key add "${k}"
    3210done
Note: See TracChangeset for help on using the changeset viewer.