diff options
author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-04-09 16:13:32 -0700 |
---|---|---|
committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-04-09 16:15:01 -0700 |
commit | 2d698b6e42d8dca191ac795ef5dba3bf62496eec (patch) | |
tree | ac5e0b67043c50f49160e9fe407435706cf30444 /debian/bash.postinst | |
parent | f1250933e4a2ac09a3d0b25b3877068e12f44da5 (diff) | |
download | vyatta-bash-2d698b6e42d8dca191ac795ef5dba3bf62496eec.tar.gz vyatta-bash-2d698b6e42d8dca191ac795ef5dba3bf62496eec.zip |
Integrate bash 3.2 version
This is merge of current Debian stable (Lenny) version of Bash
with Vyatta changes.
Diffstat (limited to 'debian/bash.postinst')
-rw-r--r-- | debian/bash.postinst | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/debian/bash.postinst b/debian/bash.postinst index 3db17ee..5fa0da1 100644 --- a/debian/bash.postinst +++ b/debian/bash.postinst @@ -1,4 +1,6 @@ -#! /bin/bash -e +#! /bin/bash + +set -e # the symlink is in the package now. So this should never happen ... if [ ! -e /bin/sh ]; then @@ -12,7 +14,9 @@ update-alternatives --install \ 10 \ || true -if [ -x /usr/sbin/add-shell ]; then +if [ "$1" = configure ] && dpkg --compare-versions "$2" le 3.2-2 \ + && [ -x /usr/sbin/add-shell ] +then /usr/sbin/add-shell /bin/bash /usr/sbin/add-shell /bin/rbash fi |