Merge pull request #15 from fda77/master

various

config/ui/patches.in

@@ -214,6 +214,15 @@ config FREETZ_REMOVE_ETHERNET_OVER_USB
 		Removes avalanche_usb.ko to save 60kB uncompressed space.
 		This is the Ethernet-over-USB driver which provides also CDROM emulation.
 
+config FREETZ_REMOVE_WEBDAV
+	bool "Remove WebDAV (AVM Online-Speicher)"
+	depends on FREETZ_AVM_HAS_WEBDAV
+	default n
+	help
+		Remove WebDAV (Online-Speicher) feature. Saves about 510 KB of
+		uncompressed data size.
+		On 7270v1 only scripts, links and a 10KB library.
+
 config FREETZ_REMOVE_MEDIASRV
 	bool "Remove mediasrv"
 	depends on \
@@ -966,15 +975,6 @@ config FREETZ_REMOVE_TELEPHONY
 		removed UPnP/dsld/userman. If it still works for boxes including those
 		functionalities, is unknown. Feel free to test it.
 
-config FREETZ_REMOVE_WEBDAV
-	bool "Remove WebDAV"
-	depends on FREETZ_AVM_HAS_WEBDAV
-	default n
-	help
-		Remove WebDAV (Online-Speicher) feature. Saves about 510 KB of
-		uncompressed data size.
-		On 7270v1 only scripts, links and a 10KB library.
-
 config FREETZ_REMOVE_WLAN
 	bool "Remove WLAN"
 	depends on FREETZ_SHOW_ADVANCED && \

patches/scripts/540-remove_webdav.sh

@@ -8,7 +8,7 @@ for files in \
   etc/onlinechanged/webdav_net \
   etc/webdav_control \
   usr/www/all/html/de/home/home_webdav.txt \
-  $([ "$FREETZ_PACKAGE_DECRYPT_FRITZOS_CFG" == "y" ] || echo bin/webdavcfginfo) \
+  $([ "$FREETZ_AVM_VERSION_06_8X_MIN" == "y" -o "$FREETZ_PACKAGE_DECRYPT_FRITZOS_CFG" == "y" ] || echo bin/webdavcfginfo) \
   ; do
 	rm_files "${FILESYSTEM_MOD_DIR}/$files"
 done