projects
/
openwrt
/
staging
/
wigyori.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
629e739
)
base-files: add initial support for mounting overlayfs
author
Felix Fietkau
<nbd@openwrt.org>
Thu, 17 Mar 2011 19:09:39 +0000
(19:09 +0000)
committer
Felix Fietkau
<nbd@openwrt.org>
Thu, 17 Mar 2011 19:09:39 +0000
(19:09 +0000)
SVN-Revision: 26207
package/base-files/files/lib/firstboot/10_reset_has_mini_fo
patch
|
blob
|
history
package/base-files/files/lib/firstboot/20_has_mini_fo
patch
|
blob
|
history
package/base-files/files/lib/functions/boot.sh
patch
|
blob
|
history
diff --git
a/package/base-files/files/lib/firstboot/10_reset_has_mini_fo
b/package/base-files/files/lib/firstboot/10_reset_has_mini_fo
index 125af0faeae41885e1aa4d85265f340524afee5b..4e285840a93d8c87a1ddf84509cd824aeb7814a1 100644
(file)
--- a/
package/base-files/files/lib/firstboot/10_reset_has_mini_fo
+++ b/
package/base-files/files/lib/firstboot/10_reset_has_mini_fo
@@
-3,10
+3,10
@@
# Copyright (C) 2006-2010 OpenWrt.org
# Copyright (C) 2010 Vertical Communications
# Copyright (C) 2006-2010 OpenWrt.org
# Copyright (C) 2010 Vertical Communications
-reset_check_for_
mini_fo
() {
- if grep -q
mini_fo
/proc/filesystems; then
+reset_check_for_
overlay
() {
+ if grep -q
E '(mini_fo|overlay)'
/proc/filesystems; then
reset_has_fo=true
fi
}
reset_has_fo=true
fi
}
-boot_hook_add jffs2reset reset_check_for_
mini_fo
+boot_hook_add jffs2reset reset_check_for_
overlay
diff --git
a/package/base-files/files/lib/firstboot/20_has_mini_fo
b/package/base-files/files/lib/firstboot/20_has_mini_fo
index 257b2b54c496f089e4238fa96f220f8d8205e842..8ca6a4fe58036c91aa42a2490370b140c7d9502f 100644
(file)
--- a/
package/base-files/files/lib/firstboot/20_has_mini_fo
+++ b/
package/base-files/files/lib/firstboot/20_has_mini_fo
@@
-3,11
+3,11
@@
# Copyright (C) 2006-2010 OpenWrt.org
# Copyright (C) 2010 Vertical Communications
# Copyright (C) 2006-2010 OpenWrt.org
# Copyright (C) 2010 Vertical Communications
-check_for_
mini_fo
() {
- if ! grep -q
mini_fo
/proc/filesystems; then
+check_for_
overlay
() {
+ if ! grep -q
E '(mini_fo|overlay)'
/proc/filesystems; then
boot_run_hook no_fo
exit 1
fi
}
boot_run_hook no_fo
exit 1
fi
}
-boot_hook_add switch2jffs check_for_
mini_fo
+boot_hook_add switch2jffs check_for_
overlay
diff --git
a/package/base-files/files/lib/functions/boot.sh
b/package/base-files/files/lib/functions/boot.sh
index a4ec7be5b25918959a0a45244e5d4a1ad4b1da25..6bdd7a14903fd98bf361e54eccfabfc7a9bc0382 100644
(file)
--- a/
package/base-files/files/lib/functions/boot.sh
+++ b/
package/base-files/files/lib/functions/boot.sh
@@
-125,7
+125,9
@@
pivot() { # <new_root> <old_root>
fopivot() { # <rw_root> <ro_root> <dupe?>
root=$1
{
fopivot() { # <rw_root> <ro_root> <dupe?>
root=$1
{
- if grep -q mini_fo /proc/filesystems; then
+ if grep -q overlay /proc/filesystems; then
+ mount -t overlayfs -olowerdir=/,upperdir=$1 "overlayfs:$1" /mnt && root=/mnt
+ elif grep -q mini_fo /proc/filesystems; then
mount -t mini_fo -o base=/,sto=$1 "mini_fo:$1" /mnt 2>&- && root=/mnt
else
mount --bind / /mnt
mount -t mini_fo -o base=/,sto=$1 "mini_fo:$1" /mnt 2>&- && root=/mnt
else
mount --bind / /mnt