@@ -20,7 +20,7 @@ INSANE_SKIP_${PN} = "ldflags"
PACKAGES =+ "${PN}-www ${PN}-lua"
FILES_${PN}-lua += "${libdir}/lua/"
-FILES_${PN}-www = "/www/*"
+FILES_${PN}-www = "/www/swupdate/*"
S = "${WORKDIR}/git/"
@@ -116,11 +116,11 @@ do_install () {
oe_runmake install
- install -m 0755 -d ${D}/www
+ install -m 0755 -d ${D}/www/swupdate
if [ -d ${S}/web-app ];then
- cp -R --no-dereference --preserve=mode,links -v ${S}/examples/www/v2/* ${D}/www
+ cp -R --no-dereference --preserve=mode,links -v ${S}/examples/www/v2/* ${D}/www/swupdate
else
- install -m 0755 ${S}/www/* ${D}/www
+ install -m 0755 ${S}/www/* ${D}/www/swupdate
fi
install -d ${D}${sysconfdir}/init.d
@@ -57,7 +57,7 @@ do_start() {
*)
echo "Starting $DESC ..."
cd /home/root
- exec $DAEMON -v -w "-r /www" $SWUPDATE_EXTRA_ARGS &
+ exec $DAEMON -v -w "-r /www/swupdate" $SWUPDATE_EXTRA_ARGS &
exit 0
;;
esac
@@ -6,7 +6,7 @@ Documentation=https://sbabic.github.io/swupdate
[Service]
ExecStartPre=-/usr/bin/swupdate-env
EnvironmentFile=-/tmp/swupdate.env
-ExecStart=/usr/bin/swupdate -v -w "-r /www" $SWUPDATE_EXTRA_ARGS
+ExecStart=/usr/bin/swupdate -v -w "-r /www/swupdate" $SWUPDATE_EXTRA_ARGS
[Install]
WantedBy=multi-user.target
Installing the document-root for the swupdate-www package in /www may be unsafe as e.g. lighttpd also installs files and symbolic links into this directory. So move the document root to /www/swupdate, which should be unique enough. Signed-off-by: Olaf Mandel <o.mandel@menlosystems.com> --- recipes-support/swupdate/swupdate.inc | 8 ++++---- recipes-support/swupdate/swupdate/swupdate | 2 +- recipes-support/swupdate/swupdate/swupdate.service | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-)