* Added configuration pages for Dropbear, HTTPd, Mount Points

* Reorganized menu structure
* Prepare firmware upgrade mechanism

3 files changed, 97 insertions, 1 deletions

diff --git a/contrib/ffluci-flash b/contrib/ffluci-flash
new file mode 100644
index 0000000000..3ff478f0f5
--- /dev/null
+++ b/contrib/ffluci-flash
@@ -0,0 +1,88 @@
+#!/bin/sh
+. /etc/functions.sh
+
+# initialize defaults
+RAMFS_COPY_BIN=""       # extra programs for temporary ramfs root
+RAMFS_COPY_DATA=""      # extra data files
+export KEEP_PATTERN=""
+export VERBOSE=1
+
+# parse options
+while [ -n "$1" ]; do
+        case "$1" in
+                -k)
+                		shift
+                		export KEEP_PATTERN="$1"
+                ;;
+                -*)
+                        echo "Invalid option: $1"
+                        exit 1
+                ;;
+                *) break;;
+        esac
+        shift;
+done
+
+export CONFFILES=/tmp/sysupgrade.conffiles
+export CONF_TAR=/tmp/sysupgrade.tgz
+
+[ -f $CONFFILES ] && rm $CONFFILES
+[ -f $CONF_TAR ]  && rm $CONF_TAR
+
+export ARGV="$*"
+export ARGC="$#"
+
+[ -z "$ARGV" ] && {
+        cat <<EOF
+Usage: $0 [options] <image file or URL>
+
+Options:
+        -k	<"file 1, file 2, ...">	Files to be kept
+EOF
+        exit 1
+}
+
+add_pattern_conffiles() {
+	local file="$1"
+	find $KEEP_PATTERN >> "$file" 2>/dev/null
+	return 0
+}
+
+# hooks
+sysupgrade_image_check="platform_check_image"
+sysupgrade_init_conffiles=""
+
+[ -n "$KEEP_PATTERN" ] && append sysupgrade_init_conffiles "add_pattern_conffiles"
+
+include /lib/upgrade
+
+do_save_conffiles() {
+        [ -z "$(rootfs_type)" ] && {
+                echo "Cannot save config while running from ramdisk."
+                exit 3
+                return 0
+        }
+        run_hooks "$CONFFILES" $sysupgrade_init_conffiles
+
+        v "Saving config files..."
+        [ "$VERBOSE" -gt 1 ] && TAR_V="v" || TAR_V=""
+        tar c${TAR_V}zf "$CONF_TAR" -T "$CONFFILES" 2>/dev/null
+}
+
+type platform_check_image >/dev/null 2>/dev/null || {
+        echo "Firmware upgrade is not implemented for this platform."
+        exit 1
+}
+
+for check in $sysupgrade_image_check; do
+        ( eval "$check \"\$ARGV\"" ) || {
+                echo "Image check '$check' failed."
+                exit 2
+        }
+done
+
+[ -n "$sysupgrade_init_conffiles" ] && do_save_conffiles
+run_hooks "" $sysupgrade_pre_upgrade
+
+v "Switching to ramdisk..."
+run_ramfs '. /etc/functions.sh; include /lib/upgrade; do_upgrade'
\ No newline at end of file
diff --git a/contrib/package/ffluci/Makefile b/contrib/package/ffluci/Makefile
index f10476e898..ba11dea3aa 100644
--- a/contrib/package/ffluci/Makefile
+++ b/contrib/package/ffluci/Makefile
@@ -40,6 +40,7 @@ define Package/ffluci/install
 	$(INSTALL_DIR) $(1)/www/ffluci
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/contrib/init.d/luci_fw $(1)/etc/init.d/luci_fw
 	$(CP) $(PKG_BUILD_DIR)/dist/* $(1)/usr/lib/lua/ -R
 	$(CP) $(PKG_BUILD_DIR)/contrib/media $(1)/www/ffluci/ -R
@@ -47,6 +48,7 @@ define Package/ffluci/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/contrib/ffluci-upload $(1)/www/cgi-bin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/contrib/index.cgi $(1)/www/cgi-bin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/contrib/index.html $(1)/www
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/contrib/ffluci-flash $(1)/sbin
 	$(CP) $(PKG_BUILD_DIR)/contrib/uci/luci $(1)/etc/config/luci
 	$(CP) $(PKG_BUILD_DIR)/contrib/uci/luci_fw $(1)/etc/config/luci_fw
 	$(CP) -a ./ipkg/ffluci.postinst $(1)/CONTROL/postinst
diff --git a/contrib/uci/luci b/contrib/uci/luci
index ba9ad47458..46795cb439 100644
--- a/contrib/uci/luci
+++ b/contrib/uci/luci
@@ -4,6 +4,9 @@ config core main
         
 config core category_privileges
 		option public nobody:nogroup
+		
+config extern flash
+		option keep "/etc/config /etc/dropbear /etc/openvpn /etc/passwd /etc/ipkg.conf /etc/httpd.conf /etc/firewall.user"
 
 config public contact
 		option nickname
@@ -20,4 +23,7 @@ config event uci_oncommit
         option wireless	"/etc/init.d/network restart"
         option olsrd	"/etc/init.d/olsrd restart"
         option dhcp		"/etc/init.d/dhcp restart"
-        option luci_fw  "/etc/init.d/luci_fw restart"
\ No newline at end of file
+        option luci_fw  "/etc/init.d/luci_fw restart"
+        option dropbear "/etc/init.d/dropbear restart"
+        option httpd	"/etc/init.d/httpd restart"
+        option fstab	"/etc/init.d/fstab restart"
\ No newline at end of file