change from /jffs to /overlay, patch from Daniel Dickinson

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20356 3c298f89-4303-0410-b956-a3cf2f4a3e73

6 files changed, 8 insertions, 8 deletions

diff --git a/package/base-files/files/lib/firstboot/20_no_fo_mount_jffs b/package/base-files/files/lib/firstboot/20_no_fo_mount_jffs
index da914b143..8a1d4e06d 100644
--- a/package/base-files/files/lib/firstboot/20_no_fo_mount_jffs
+++ b/package/base-files/files/lib/firstboot/20_no_fo_mount_jffs
@@ -5,11 +5,11 @@
 
 no_fo_mount_jffs() {
     # initialize jffs2
-    mount "$mtdpart" /jffs -t jffs2 || exit
+    mount "$mtdpart" /overlay -t jffs2 || exit
     
     # workaround to ensure that union can attach properly
     sync
-    ls /jffs >/dev/null
+    ls /overlay >/dev/null
 }
 
 boot_hook_add no_fo no_fo_mount_jffs
diff --git a/package/base-files/files/lib/firstboot/30_is_rootfs_mounted b/package/base-files/files/lib/firstboot/30_is_rootfs_mounted
index 7c3fe6c4c..e2ba01d50 100644
--- a/package/base-files/files/lib/firstboot/30_is_rootfs_mounted
+++ b/package/base-files/files/lib/firstboot/30_is_rootfs_mounted
@@ -4,7 +4,7 @@
 # Copyright (C) 2010 Vertical Communications
 
 skip_if_rootfs_mounted() {
-    mount "$mtdpart" /rom/jffs -t jffs2 || exit
+    mount "$mtdpart" /rom/overlay -t jffs2 || exit
 }
 
 boot_hook_add switch2jffs skip_if_rootfs_mounted
diff --git a/package/base-files/files/lib/firstboot/30_no_fo_pivot b/package/base-files/files/lib/firstboot/30_no_fo_pivot
index cb82cde5d..b5c2601ee 100644
--- a/package/base-files/files/lib/firstboot/30_no_fo_pivot
+++ b/package/base-files/files/lib/firstboot/30_no_fo_pivot
@@ -5,7 +5,7 @@
 
 no_fo_pivot() {
     # switch to the new (empty) jffs2
-    fopivot /jffs /rom 1
+    fopivot /overlay /rom 1
 }
 
 boot_hook_add no_fo no_fo_pivot
diff --git a/package/base-files/files/lib/firstboot/40_copy_ramoverlay b/package/base-files/files/lib/firstboot/40_copy_ramoverlay
index 4b6a8828f..39c2edacb 100644
--- a/package/base-files/files/lib/firstboot/40_copy_ramoverlay
+++ b/package/base-files/files/lib/firstboot/40_copy_ramoverlay
@@ -8,7 +8,7 @@ copy_ramoverlay() {
     mount -o remount,ro none / 2>&-
     # copy ramoverlay to jffs2
     echo -n "copying files ... "
-    cp -a /tmp/root/* /rom/jffs 2>&-
+    cp -a /tmp/root/* /rom/overlay 2>&-
     echo "done"
 }
 
diff --git a/package/base-files/files/lib/firstboot/50_pivot b/package/base-files/files/lib/firstboot/50_pivot
index fa1c7b540..53801d7a8 100644
--- a/package/base-files/files/lib/firstboot/50_pivot
+++ b/package/base-files/files/lib/firstboot/50_pivot
@@ -9,9 +9,9 @@ with_fo_pivot() {
     pivot /rom /mnt
     mount -o move /mnt /tmp/root
 
-    # /jffs is the overlay
+    # /overlay is the overlay
     # /rom is the readonly
-    fopivot /jffs /rom
+    fopivot /overlay /rom
 }
 
 boot_hook_add switch2jffs with_fo_pivot
diff --git a/package/base-files/files/lib/firstboot/99_10_no_fo_cleanup b/package/base-files/files/lib/firstboot/99_10_no_fo_cleanup
index 5eddfb14f..6dedcb1e8 100644
--- a/package/base-files/files/lib/firstboot/99_10_no_fo_cleanup
+++ b/package/base-files/files/lib/firstboot/99_10_no_fo_cleanup
@@ -5,7 +5,7 @@
 
 no_fo_cleanup() {
     echo "done"
-    umount -l /jffs
+    umount -l /overlay
     umount -l /tmp/root
     exit 0
 }