diff options
| author | Tim Smith <tsmith@chef.io> | 2021-09-20 13:00:09 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-20 13:00:09 -0700 |
| commit | f76e50095ae6e78c0b8f6cea20aa006969e1fa8c (patch) | |
| tree | e567660dd8a413e18cf9538cf7f62095e083e354 | |
| parent | 6d671b711a5b17d21cf46eb3f4f43bfce474e338 (diff) | |
| parent | bc961e74cb7d64cd995e455da6f4da56890b8fe5 (diff) | |
| download | chef-f76e50095ae6e78c0b8f6cea20aa006969e1fa8c.tar.gz | |
Merge pull request #12064 from chef/lcg/symlink-knife
Don't setup broken symlink to knife
| -rw-r--r-- | omnibus/omnibus-test.sh | 5 | ||||
| -rwxr-xr-x | omnibus/package-scripts/angrychef/postinst | 1 | ||||
| -rwxr-xr-x | omnibus/package-scripts/chef/postinst | 1 |
3 files changed, 0 insertions, 7 deletions
diff --git a/omnibus/omnibus-test.sh b/omnibus/omnibus-test.sh index 7e01cbe60b..47b21ae431 100644 --- a/omnibus/omnibus-test.sh +++ b/omnibus/omnibus-test.sh @@ -45,11 +45,6 @@ if [[ ! -L $USR_BIN_DIR/chef-client ]] || [[ $(ls -l $USR_BIN_DIR/chef-client | exit 1 fi -if [[ ! -L $USR_BIN_DIR/knife ]] || [[ $(ls -l $USR_BIN_DIR/knife | awk '{print$NF}') != "$BIN_DIR/knife" ]]; then - echo "$USR_BIN_DIR/knife symlink to $BIN_DIR/knife was not correctly created by the pre-install script!" - exit 1 -fi - if [[ ! -L $USR_BIN_DIR/chef-solo ]] || [[ $(ls -l $USR_BIN_DIR/chef-solo | awk '{print$NF}') != "$BIN_DIR/chef-solo" ]]; then echo "$USR_BIN_DIR/chef-solo symlink to $BIN_DIR/chef-solo was not correctly created by the pre-install script!" exit 1 diff --git a/omnibus/package-scripts/angrychef/postinst b/omnibus/package-scripts/angrychef/postinst index c8f75105ce..aa3f5d8468 100755 --- a/omnibus/package-scripts/angrychef/postinst +++ b/omnibus/package-scripts/angrychef/postinst @@ -87,7 +87,6 @@ fi if [ -f "$INSTALLER_DIR/bin/chef-shell" ]; then ln -sf $INSTALLER_DIR/bin/chef-shell $PREFIX/bin || error_exit "Cannot link chef-shell to $PREFIX/bin" fi -ln -sf $INSTALLER_DIR/bin/knife $PREFIX/bin || error_exit "Cannot link knife to $PREFIX/bin" ln -sf $INSTALLER_DIR/bin/ohai $PREFIX/bin || error_exit "Cannot link ohai to $PREFIX/bin" # We test for the presence of /usr/bin/chef-client to know if this script succeeds, so this diff --git a/omnibus/package-scripts/chef/postinst b/omnibus/package-scripts/chef/postinst index 61d1d0abe1..977e671bd0 100755 --- a/omnibus/package-scripts/chef/postinst +++ b/omnibus/package-scripts/chef/postinst @@ -86,7 +86,6 @@ fi if [ -f "$INSTALLER_DIR/bin/chef-shell" ]; then ln -sf $INSTALLER_DIR/bin/chef-shell $PREFIX/bin || error_exit "Cannot link chef-shell to $PREFIX/bin" fi -ln -sf $INSTALLER_DIR/bin/knife $PREFIX/bin || error_exit "Cannot link knife to $PREFIX/bin" ln -sf $INSTALLER_DIR/bin/ohai $PREFIX/bin || error_exit "Cannot link ohai to $PREFIX/bin" # We test for the presence of /usr/bin/chef-client to know if this script succeeds, so this |