mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-11-19 09:32:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(coreos-base): remove conflicts with base layout

Browse Source 
Detected file collision(s):

	/etc/sysctl.conf
	/etc/ssh/sshd_config
	/etc/ssh/ssh_config
	/bin/sh
	/usr/libexec/pager
	/usr/libexec/editor
	/usr/bin/awk
This commit is contained in:
Brandon Philips 2013-02-05 17:15:19 -08:00
parent ad1e0a5425
commit f9e96ee158
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0.ebuild vendored
View File

@ -94,7 +94,7 @@ pkg_setup() {
src_install() { src_install() {
insinto /etc insinto /etc
doins "${FILESDIR}"/sysctl.conf || die #doins "${FILESDIR}"/sysctl.conf || die
insinto /etc/profile.d insinto /etc/profile.d
doins "${FILESDIR}"/xauthority.sh || die doins "${FILESDIR}"/xauthority.sh || die
@ -111,20 +111,20 @@ src_install() {
dosym /var/lib/timezone/localtime /etc/localtime || die dosym /var/lib/timezone/localtime /etc/localtime || die
# We use mawk in the target boards, not gawk. # We use mawk in the target boards, not gawk.
dosym mawk /usr/bin/awk || die #dosym mawk /usr/bin/awk || die
# We want dash as our main shell. # We want dash as our main shell.
dosym dash /bin/sh #dosym dash /bin/sh
# Avoid the wrapper and just link to the only editor we have. # Avoid the wrapper and just link to the only editor we have.
dodir /usr/libexec #dodir /usr/libexec
dosym /usr/bin/vim /usr/libexec/editor || die #dosym /usr/bin/vim /usr/libexec/editor || die
dosym /bin/more /usr/libexec/pager || die #dosym /bin/more /usr/libexec/pager || die
# Install our custom ssh config settings. # Install our custom ssh config settings.
insinto /etc/ssh #insinto /etc/ssh
doins "${FILESDIR}"/ssh{,d}_config #doins "${FILESDIR}"/ssh{,d}_config
fperms 600 /etc/ssh/sshd_config #fperms 600 /etc/ssh/sshd_config
# Custom login shell snippets. # Custom login shell snippets.
insinto /etc/profile.d insinto /etc/profile.d