From fc19d318533b34736a5c18f2af3232f67c708f31 Mon Sep 17 00:00:00 2001 From: Diederik de Groot Date: Thu, 15 Mar 2018 15:19:36 +0100 Subject: [PATCH] Fix tftp-hpa rewrite rules for SPA -cnf.xml files --- etc/tftpd-hpa/rewrite.rules | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/etc/tftpd-hpa/rewrite.rules b/etc/tftpd-hpa/rewrite.rules index fcec569..dd9b4b0 100644 --- a/etc/tftpd-hpa/rewrite.rules +++ b/etc/tftpd-hpa/rewrite.rules @@ -163,19 +163,25 @@ ri ^(SCCP894x)(.+\.loads)$ firmware/894x/\1\2 # ata186/ata188 firmware (ancient) ri ^(ATA030204SCCP090202A.zup)$ firmware/ata186/\1 - # Sub-Directory Handling +# settings +ri ^(.+\.cnf.xml)$ settings/\1 +ri ^\/(.+\-cnf.xml)$ settings/\1 +ri ^\/(SPA504G-cfg.xml)$ settings/\1 + # Keep firmware in a separate directory (optional) #ri ^(.+\.loads)$ firmware/\1 #ri ^(.+\.sbn)$ firmware/\1 # Keep locales in a separate directory (optional) -ri ^(.+)/(.+-sip.jar)$ locales/\1/\2 -ri ^(.+)/(.+-tones.xml)$ locales/\1/\2 +ri ^(.+)/(.+-sccp.jar)$ locales/languages/\1/\2 +ri ^(.+)/(.+-dictionary.xml)$ locales/languages/\1/\2 +ri ^(.+)/(.+-tones.xml)$ locales/countries/\1/\2 # Keep ring-tones in a separate directory (optional) -ri ^(Ringlist)(\.xml|-wb\.xml)(\.sgn)?$ ringtones/\1\2\3 +ri ^([R|r]ing[L|l]ist)(\.xml|-wb\.xml)(\.sgn)?$ ringtones/ringlist.xml +ri ^(Distinctive[R|r]ing[L|l]ist)(\.xml|-wb\.xml)(\.sgn)?$ ringtones/ringlist.xml ri ^(.+)(\.raw|\.rwb)(\.sgn)?$ ringtones/\1\2\3 # Rename Desktops to wallpapers (optional)