Change wording if debian-tor's homedir is wrong, do not print anything if it is ok.

Whitespace nazi found out about debian/tor.postinst.

svn:r13206
This commit is contained in:
Peter Palfrader 2008-01-21 14:46:49 +00:00
parent aa4f86dafa
commit 3d3dbe90ab
2 changed files with 21 additions and 18 deletions

4
debian/changelog vendored
View File

@ -4,8 +4,10 @@ tor (0.2.0.17-alpha-1+svn) experimental; urgency=low
to have a uid between 100 and 999. There is no good reason
to require this. If the local admin moves the system users/uid-space
to some other range then they probably have a good reason for that.
* postinst: change wording if debian-tor's homedir is wrong, do not
print anything if it is ok.
-- Peter Palfrader <weasel@debian.org> Mon, 21 Jan 2008 15:43:52 +0100
-- Peter Palfrader <weasel@debian.org> Mon, 21 Jan 2008 15:46:29 +0100
tor (0.2.0.17-alpha-1) experimental; urgency=low

35
debian/tor.postinst vendored
View File

@ -9,24 +9,25 @@ home=`getent passwd debian-tor | cut -d ":" -f 6`
# the sanit(ar)y checks otherwise we can safely create it.
if [ "$uid" ]; then
if [ "$home" = "/var/lib/tor" ]; then
echo "debian-tor homedir check: ok"
else
echo "ERROR: debian-tor account has an invalid home directory!"
echo "Please check /usr/share/doc/tor/README.Debian on how to"
echo "correct this problem"
exit 1
fi
if [ "$home" = "/var/lib/tor" ]; then
:
#echo "debian-tor homedir check: ok"
else
echo "ERROR: debian-tor account has an unexpected home directory!"
echo "It should be '/var/lib/tor', but it is '$home'."
echo "Removing the debian-tor user might fix this, but the question"
echo "remains how you got into this mess to begin with."
exit 1
fi
else
# what this might mean?? oh creating a system l^Huser!
adduser --quiet \
--system \
--disabled-password \
--home /var/lib/tor \
--no-create-home \
--shell /bin/bash \
--group \
debian-tor
adduser --quiet \
--system \
--disabled-password \
--home /var/lib/tor \
--no-create-home \
--shell /bin/bash \
--group \
debian-tor
fi
# ch{owning,moding} things around