summaryrefslogtreecommitdiff
path: root/cleopatre/buildroot
diff options
context:
space:
mode:
authorOlivier Dufour2013-02-05 13:51:27 +0100
committerCyril Jourdan2013-02-11 13:22:46 +0100
commitf38ab3215e567d1460ed8284b09b28bafae1256f (patch)
tree4358f0179fa04f2cf2d92fb854f1712ebdc2f7c5 /cleopatre/buildroot
parent03cdc92525306fc272048366ad07dc7f586459e4 (diff)
cleo/buildroot/target_skeleton: manage autoswitch flashfs, refs #3745
userfs is now mount in /mnt/flashfs. /usr/local is a symlink to the root fs, i.e. /mnt/flashfs for a 500 fs, and /mnt/flashfs/500 for an autoswitch fs.
Diffstat (limited to 'cleopatre/buildroot')
-rw-r--r--cleopatre/buildroot/target/device/Spidcom/target_skeleton/etc/fstab2
-rwxr-xr-xcleopatre/buildroot/target/device/Spidcom/target_skeleton/etc/rc.sysinit8
-rw-r--r--cleopatre/buildroot/target/device/Spidcom/target_skeleton/mnt/flashfs/.empty (renamed from cleopatre/buildroot/target/device/Spidcom/target_skeleton/usr/local/.empty)0
3 files changed, 9 insertions, 1 deletions
diff --git a/cleopatre/buildroot/target/device/Spidcom/target_skeleton/etc/fstab b/cleopatre/buildroot/target/device/Spidcom/target_skeleton/etc/fstab
index 0519ff74a2..29d5238dd6 100644
--- a/cleopatre/buildroot/target/device/Spidcom/target_skeleton/etc/fstab
+++ b/cleopatre/buildroot/target/device/Spidcom/target_skeleton/etc/fstab
@@ -6,5 +6,5 @@ proc /proc proc defaults 0 0
sysfs /sys sysfs defaults 0 0
devpts /dev/pts devpts defaults,gid=5,mode=620 0 0
tmpfs /tmp tmpfs defaults 0 0
-/dev/mtdblock2 /usr/local jffs2 defaults 0 0
+/dev/mtdblock2 /mnt/flashfs jffs2 defaults 0 0
diff --git a/cleopatre/buildroot/target/device/Spidcom/target_skeleton/etc/rc.sysinit b/cleopatre/buildroot/target/device/Spidcom/target_skeleton/etc/rc.sysinit
index 79e1620513..fbc2aeb362 100755
--- a/cleopatre/buildroot/target/device/Spidcom/target_skeleton/etc/rc.sysinit
+++ b/cleopatre/buildroot/target/device/Spidcom/target_skeleton/etc/rc.sysinit
@@ -3,5 +3,13 @@
/bin/mount -o remount,rw /
/bin/mount -t proc proc /proc
/bin/mount -a
+
+# Link /usr/local to the right fs
+if [ -d /mnt/flashfs/500 ]; then
+ /bin/ln -s /mnt/flashfs/500 /usr/local
+else
+ /bin/ln -s /mnt/flashfs /usr/local
+fi
+
/bin/cp -a /usr/local/etc/* /etc/
/bin/hostname -F /etc/hostname
diff --git a/cleopatre/buildroot/target/device/Spidcom/target_skeleton/usr/local/.empty b/cleopatre/buildroot/target/device/Spidcom/target_skeleton/mnt/flashfs/.empty
index e69de29bb2..e69de29bb2 100644
--- a/cleopatre/buildroot/target/device/Spidcom/target_skeleton/usr/local/.empty
+++ b/cleopatre/buildroot/target/device/Spidcom/target_skeleton/mnt/flashfs/.empty