Mercurial > dropbear
changeset 219:654bc8327787
merge of 9522146cb07d4576f161fc4567c2c2fbd6f61fbb
and b11630c15bc4d0649dba51c3572cac6f44e0ab0e
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Fri, 08 Jul 2005 13:28:03 +0000 |
| parents | 3ee0c2f85e1e (diff) 29f8b18cf794 (current diff) |
| children | 9089929fb2b7 |
| files | debian/changelog debian/dropbear.postinst debian/rules |
| diffstat | 5 files changed, 19 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/debian/changelog Fri Jul 08 13:19:20 2005 +0000 +++ b/debian/changelog Fri Jul 08 13:28:03 2005 +0000 @@ -1,3 +1,13 @@ +dropbear (0.45-3) unstable; urgency=low + + * debian/dropbear.init: init script prints human readable message in case + it's disabled (closes: #309099). + * debian/dropbear.postinst: configure: restart service through init script + instead of start. + * debian/dropbear.prerm: set -u -> set -e. + + -- Gerrit Pape <[email protected]> Wed, 25 May 2005 22:38:17 +0000 + dropbear (0.45-2) unstable; urgency=low * Matt Johnston:
--- a/debian/dropbear.init Fri Jul 08 13:19:20 2005 +0000 +++ b/debian/dropbear.init Fri Jul 08 13:28:03 2005 +0000 @@ -14,10 +14,12 @@ set -e +cancel() { echo "$1" >&2; exit 0; }; test ! -r /etc/default/dropbear || . /etc/default/dropbear -test "$NO_START" = "0" || exit 0 -test -x "$DAEMON" || exit 0 -test ! -h /var/service/dropbear || exit 0 +test "$NO_START" = "0" || cancel 'NO_START is not set to zero.' +test -x "$DAEMON" || cancel "$DAEMON does not exist or is not executable." +test ! -h /var/service/dropbear || \ + cancel '/var/service/dropbear exists, service is controlled through runit.' test -z "$DROPBEAR_BANNER" || \ DROPBEAR_EXTRA_ARGS="$DROPBEAR_EXTRA_ARGS -b $DROPBEAR_BANNER"
--- a/debian/dropbear.postinst Fri Jul 08 13:19:20 2005 +0000 +++ b/debian/dropbear.postinst Fri Jul 08 13:28:03 2005 +0000 @@ -60,8 +60,8 @@ if test -x /etc/init.d/dropbear; then update-rc.d dropbear defaults >/dev/null if test -x /usr/sbin/invoke-rc.d; then - invoke-rc.d dropbear start + invoke-rc.d dropbear restart else - /etc/init.d/dropbear start + /etc/init.d/dropbear restart fi fi
--- a/debian/dropbear.prerm Fri Jul 08 13:19:20 2005 +0000 +++ b/debian/dropbear.prerm Fri Jul 08 13:28:03 2005 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -set -u +set -e test "$1" = 'remove' || test "$1" = 'deconfigure' || exit 0 if test -x /etc/init.d/dropbear; then
--- a/debian/rules Fri Jul 08 13:19:20 2005 +0000 +++ b/debian/rules Fri Jul 08 13:28:03 2005 +0000 @@ -85,7 +85,7 @@ done gzip -9 '$(DIR)'/usr/share/man/man8/*.8 install -d -m0755 '$(DIR)'/usr/share/man/man1 - install -m644 dbclient.1 '$(DIR)'/usr/share/man/man1/ + install -m644 debian/dbclient.1 '$(DIR)'/usr/share/man/man1/ gzip -9 '$(DIR)'/usr/share/man/man1/*.1 # copyright, changelog cat debian/copyright.in LICENSE >debian/copyright