aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-03-21 17:16:50 +0000
committerFlorian Fainelli <florian@openwrt.org>2010-03-21 17:16:50 +0000
commit7af8ee04812f647ce74adbe04f0d5d18a39bbd29 (patch)
tree9a50a2973e0866572e2cf8394d65dba645ac3c08 /package
parente7f046805af93c3af6d318907033cf0d803e4b34 (diff)
downloadupstream-7af8ee04812f647ce74adbe04f0d5d18a39bbd29.tar.gz
upstream-7af8ee04812f647ce74adbe04f0d5d18a39bbd29.tar.bz2
upstream-7af8ee04812f647ce74adbe04f0d5d18a39bbd29.zip
change from /jffs to /overlay, patch from Daniel Dickinson
SVN-Revision: 20356
Diffstat (limited to 'package')
-rw-r--r--package/base-files/Makefile2
-rw-r--r--package/base-files/files/lib/firstboot/20_no_fo_mount_jffs4
-rw-r--r--package/base-files/files/lib/firstboot/30_is_rootfs_mounted2
-rw-r--r--package/base-files/files/lib/firstboot/30_no_fo_pivot2
-rw-r--r--package/base-files/files/lib/firstboot/40_copy_ramoverlay2
-rw-r--r--package/base-files/files/lib/firstboot/50_pivot4
-rw-r--r--package/base-files/files/lib/firstboot/99_10_no_fo_cleanup2
-rw-r--r--package/base-files/files/lib/functions/boot.sh3
-rw-r--r--package/base-files/files/lib/preinit/40_mount_jffs23
-rw-r--r--package/base-files/files/lib/preinit/70_pivot_jffs2_root3
-rw-r--r--package/base-files/files/lib/upgrade/common.sh10
-rwxr-xr-xpackage/base-files/files/sbin/firstboot4
-rw-r--r--package/block-extroot/files/50_determine_usb_root4
-rw-r--r--package/block-extroot/files/60_pivot_usb_root2
-rw-r--r--package/opkg/files/opkg.conf2
15 files changed, 25 insertions, 24 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 0d4c29eec8..88ab610187 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -364,7 +364,7 @@ define Package/base-files/install
mkdir -p $(1)/dev
mkdir -p $(1)/etc/crontabs
mkdir -p $(1)/etc/rc.d
- mkdir -p $(1)/jffs
+ mkdir -p $(1)/overlay
mkdir -p $(1)/lib/firmware
$(if $(LIB_SUFFIX),-ln -s lib $(1)/lib$(LIB_SUFFIX))
mkdir -p $(1)/mnt
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 da914b143f..8a1d4e06d2 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 7c3fe6c4c8..e2ba01d502 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 cb82cde5dd..b5c2601ee8 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 4b6a8828f0..39c2edacba 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 fa1c7b5400..53801d7a8f 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 5eddfb14f8..6dedcb1e87 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
}
diff --git a/package/base-files/files/lib/functions/boot.sh b/package/base-files/files/lib/functions/boot.sh
index 96c1c59db2..e6f6633adb 100644
--- a/package/base-files/files/lib/functions/boot.sh
+++ b/package/base-files/files/lib/functions/boot.sh
@@ -42,7 +42,7 @@ dupe() { # <new_root> <old_root>
{
cd $2
find . -xdev -type d
- echo "./dev ./jffs ./mnt ./proc ./tmp"
+ echo "./dev ./overlay ./mnt ./proc ./tmp"
# xdev skips mounted directories
cd $1
} | xargs mkdir -p
@@ -69,7 +69,6 @@ pivot() { # <new_root> <old_root>
mount -o move $2/dev /dev
mount -o move $2/tmp /tmp
mount -o move $2/sys /sys 2>&-
- mount -o move $2/jffs /jffs 2>&-
mount -o move $2/overlay /overlay 2>&-
return 0
}
diff --git a/package/base-files/files/lib/preinit/40_mount_jffs2 b/package/base-files/files/lib/preinit/40_mount_jffs2
index 99fe262c68..cb743ea75c 100644
--- a/package/base-files/files/lib/preinit/40_mount_jffs2
+++ b/package/base-files/files/lib/preinit/40_mount_jffs2
@@ -3,7 +3,8 @@
# Copyright (C) 2010 Vertical Communications
find_mount_jffs2() {
- mount "$(find_mtd_part rootfs_data)" /jffs -t jffs2
+ mkdir -p /tmp/overlay
+ mount "$(find_mtd_part rootfs_data)" /tmp/overlay -t jffs2
}
jffs2_not_mounted() {
diff --git a/package/base-files/files/lib/preinit/70_pivot_jffs2_root b/package/base-files/files/lib/preinit/70_pivot_jffs2_root
index f0a2a5569a..821bfb14f3 100644
--- a/package/base-files/files/lib/preinit/70_pivot_jffs2_root
+++ b/package/base-files/files/lib/preinit/70_pivot_jffs2_root
@@ -5,7 +5,8 @@
rootfs_pivot() {
check_skip || jffs2_not_mounted || {
echo "switching to jffs2"
- fopivot /jffs /rom && pi_mount_skip_next=true
+ mount -o move /tmp/overlay /overlay 2>&-
+ fopivot /overlay /rom && pi_mount_skip_next=true
}
}
diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh
index 3beb6484d8..970016e7ba 100644
--- a/package/base-files/files/lib/upgrade/common.sh
+++ b/package/base-files/files/lib/upgrade/common.sh
@@ -35,7 +35,7 @@ install_bin() { # <file> [ <symlink> ... ]
pivot() { # <new_root> <old_root>
mount | grep "on $1 type" 2>&- 1>&- || mount -o bind $1 $1
- mkdir -p $1$2 $1/proc $1/dev $1/tmp $1/jffs && \
+ mkdir -p $1$2 $1/proc $1/dev $1/tmp $1/overlay && \
mount -o move /proc $1/proc && \
pivot_root $1 $1$2 || {
umount $1 $1
@@ -43,7 +43,7 @@ pivot() { # <new_root> <old_root>
}
mount -o move $2/dev /dev
mount -o move $2/tmp /tmp
- mount -o move $2/jffs /jffs 2>&-
+ mount -o move $2/overlay /overlay 2>&-
return 0
}
@@ -63,9 +63,9 @@ run_ramfs() { # <command> [...]
mount -o remount,ro /mnt
umount -l /mnt
- grep /jffs /proc/mounts > /dev/null && {
- mount -o remount,ro /jffs
- umount -l /jffs
+ grep /overlay /proc/mounts > /dev/null && {
+ mount -o remount,ro /overlay
+ umount -l /overlay
}
# spawn a new shell from ramdisk to reduce the probability of cache issues
diff --git a/package/base-files/files/sbin/firstboot b/package/base-files/files/sbin/firstboot
index e9994dec38..4da299189e 100755
--- a/package/base-files/files/sbin/firstboot
+++ b/package/base-files/files/sbin/firstboot
@@ -27,8 +27,8 @@ if [ "${0##*/}" = "firstboot" ]; then
boot_run_hook jffs2reset
else
mtd erase "$partname"
- mount "$mtdpart" /jffs -t jffs2
- fopivot /jffs /rom 1
+ mount "$mtdpart" /overlay -t jffs2
+ fopivot /overlay /rom 1
fi
fi
diff --git a/package/block-extroot/files/50_determine_usb_root b/package/block-extroot/files/50_determine_usb_root
index 1e5f153b6a..192990c919 100644
--- a/package/block-extroot/files/50_determine_usb_root
+++ b/package/block-extroot/files/50_determine_usb_root
@@ -16,8 +16,8 @@ determine_external_root() {
# extroot requires extroot and fstab config files, therefore
# we assume configuration is incomplete and not to be used if either of them
# is missing (for jffs versions of these files on squashfs image)
- if [ "$jffs" = "/jffs" ] && [ -r "/jffs/etc/config/fstab" ]; then
- UCI_CONFIG_DIR="/jffs/etc/config"
+ if [ "$jffs" = "/tmp/overlay" ] && [ -r "/tmp/overlay/etc/config/fstab" ]; then
+ UCI_CONFIG_DIR="/tmp/overlay/etc/config"
ER_IS_SQUASHFS=true
fi
diff --git a/package/block-extroot/files/60_pivot_usb_root b/package/block-extroot/files/60_pivot_usb_root
index c8572a35fd..1c9be97cae 100644
--- a/package/block-extroot/files/60_pivot_usb_root
+++ b/package/block-extroot/files/60_pivot_usb_root
@@ -10,7 +10,7 @@ external_root_pivot() {
check_skip || [ "$pi_extroot_mount_success" != "true" ] || {
echo "switching to external rootfs"
if [ "$ER_IS_SQUASHFS" = "true" ]; then
- umount /jffs
+ umount /tmp/overlay
fi
mount -o remount,ro / && fopivot /overlay /rom && pi_mount_skip_next=true
}
diff --git a/package/opkg/files/opkg.conf b/package/opkg/files/opkg.conf
index fb61d7a470..0e85936ba2 100644
--- a/package/opkg/files/opkg.conf
+++ b/package/opkg/files/opkg.conf
@@ -2,4 +2,4 @@ src/gz snapshots http://downloads.openwrt.org/snapshots/trunk/$S/packages
dest root /
dest ram /tmp
lists_dir ext /var/opkg-lists
-option overlay_root /jffs
+option overlay_root /overlay