Fix daemon-util with non-root user models
Fix daemon-util with non-root user models

Commit 4b42c3d6 broke non-root user mode since, while trying to do a
cleanup a move all local variable definitions to the start of the
function; however, the plain_name var is only defined later, so this
actually doesn't work.

Note that enabling set -u doesn't _directly_ work, since we rely on
some variables which are usually undefined (EXTRA_*_ARGS, etc.). It
can be fixed, but in a later patch.

Signed-off-by: Iustin Pop <acf83a5274f31a43af6b914614365999469c1a31@google.com>
Reviewed-by: René Nussbaumer <bc755ac45a0e799d1d490cba76febc56d80cc5fc@google.com>

bitemyapp/ganeti,apyrgio/ganeti,yiannist/ganeti,ganeti/ganeti,ganeti/ganeti,ganeti-github-testing/ganeti-test-1,ganeti/ganeti,apyrgio/ganeti,bitemyapp/ganeti,andir/ganeti,apyrgio/snf-ganeti,yiannist/ganeti,leshchevds/ganeti,leshchevds/ganeti,apyrgio/snf-ganeti,grnet/snf-ganeti,dimara/ganeti,yiannist/ganeti,onponomarev/ganeti,mbakke/ganeti,andir/ganeti,mbakke/ganeti,grnet/snf-ganeti,mbakke/ganeti,dimara/ganeti,onponomarev/ganeti,andir/ganeti,ganeti-github-testing/ganeti-test-1,leshchevds/ganeti