debian/loolwsd.postinst.in | 2 +-
tools/Config.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 322eaf58142f692fd393bd0ec6a98a073e4c494a
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Sun Jul 5 09:01:50 2020 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sun Jul 5 13:28:28 2020 +0200
systemplate files are not writable by lool user
See also f1be65668c749526011faa39266f289522a9cf68
systemplate files should not be writable by lool user
Change-Id: I5684248d3d4b4b0ba56f8c5ab490a6e7df0e0038
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98069
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/debian/loolwsd.postinst.in b/debian/loolwsd.postinst.in
index ac38e2ab1..05e0c02f9 100644
--- a/debian/loolwsd.postinst.in
+++ b/debian/loolwsd.postinst.in
@@ -28,7 +28,7 @@ case "$1" in
loolwsd-generate-proof-key >/dev/null 2>&1
cat << EOF > /etc/apt/apt.conf.d/25loolwsd
// Rebuild systemplate of @APP_NAME@
-DPkg::Post-Invoke { "echo Updating loolwsd systemplate;su lool --shell=/bin/sh
-c 'loolwsd-systemplate-setup /opt/lool/systemplate @LO_PATH@ >/dev/null
2>&1'"; };
+DPkg::Post-Invoke { "echo Updating loolwsd
systemplate;loolwsd-systemplate-setup /opt/lool/systemplate @LO_PATH@
>/dev/null 2>&1"; };
EOF
;;
diff --git a/tools/Config.cpp b/tools/Config.cpp
index 9c4093910..4bf297fb6 100644
--- a/tools/Config.cpp
+++ b/tools/Config.cpp
@@ -364,7 +364,7 @@ int Config::main(const std::vector<std::string>& args)
}
else if (args[0] == "update-system-template")
{
- const char command[] = "su lool --shell=/bin/sh -c
'loolwsd-systemplate-setup /opt/lool/systemplate " LO_PATH " >/dev/null 2>&1'";
+ const char command[] = "loolwsd-systemplate-setup
/opt/lool/systemplate " LO_PATH " >/dev/null 2>&1";
std::cout << "Running the following command:" << std::endl
<< command << std::endl;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
