deploy: Ignore sockets, fifos in /etc/<subdir> during merge

[yummypeng]

It's a followup of commit e6a560b. We should also ignore sockets and fifos in the subdir of /etc.

[openshift-ci]

Hi @yummypeng. Thanks for your PR.

I'm waiting for a ostreedev member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[cgwalters]

/ok-to-test

[cgwalters]

Thanks, this looks good. Would be nice to have a test but we can do that after, and I don't expect you to learn our test suite for things like this.

Thanks again!