YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Include patch directly in postinst to be sure we can access it ...

Browse source
This commit is contained in:
Alexandre Aubin 2018-06-26 03:05:38 +02:00
parent e708599452
commit 3ac3355218
2 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
debian/dnsmasq.patch vendored
View file

@ -1,12 +0,0 @@
index 46abdc4..49556ad 100644 (file)
--- a/debian/init
+++ b/debian/init
@@ -111,7 +111,7 @@ DNSMASQ_OPTS="$DNSMASQ_OPTS --local-service"
ROOT_DS="/usr/share/dns/root.ds"
if [ -f $ROOT_DS ]; then
- DNSMASQ_OPTS="$DNSMASQ_OPTS `sed -e s/". IN DS "/--trust-anchor=.,/ -e s/" "/,/g $ROOT_DS | tr '\n' ' '`"
+ DNSMASQ_OPTS="$DNSMASQ_OPTS `sed -e s/"^.*DS[\t ]"/--trust-anchor=.,/ -e s/" "/,/g $ROOT_DS | tr '\n' ' '`"
fi
start()

18
debian/postinst vendored
View file

@ -15,7 +15,23 @@ do_configure() {
yunohost service regen-conf --output-as none yunohost service regen-conf --output-as none
echo "Patch Dnsmasq service" echo "Patch Dnsmasq service"
patch -N /etc/init.d/dnsmasq dnsmasq.patch | true DNSMASQ_PATCH=$(cat << 'EOF'
index 46abdc4..49556ad 100644 (file)
--- a/debian/init
+++ b/debian/init
@@ -111,7 +111,7 @@ DNSMASQ_OPTS="$DNSMASQ_OPTS --local-service"
ROOT_DS="/usr/share/dns/root.ds"
if [ -f $ROOT_DS ]; then
- DNSMASQ_OPTS="$DNSMASQ_OPTS `sed -e s/". IN DS "/--trust-anchor=.,/ -e s/" "/,/g $ROOT_DS | tr '\n' ' '`"
+ DNSMASQ_OPTS="$DNSMASQ_OPTS `sed -e s/"^.*DS[\t ]"/--trust-anchor=.,/ -e s/" "/,/g $ROOT_DS | tr '\n' ' '`"
fi
start()
EOF
)
patch -N /etc/init.d/dnsmasq <<< "$DNSMASQ_PATCH" | true
echo "Launching migrations.." echo "Launching migrations.."
yunohost tools migrations migrate --auto yunohost tools migrations migrate --auto