6e419fbdeb
Fix extroot by UUID
...
Extroot works fine when the target device is specified by a path. It fails
however if the device is specified by UUID (the target partition gets mounted
much later by hotplug hooks). This is because the blkid command is no longer
compiled into BusyBox (since changeset [1]) so it's unavailable for the
preinit phase.
The closest bug report I was able to find is [2], although the reporting person
mentions that /tmp/overlay-disabled showed up which wasn't there in my case.
This patch sets PATH and LD_LIBRARY_PATH environment variables so that the
blkid command installed on the target device can be used by that particular
preinit script.
[1] https://dev.openwrt.org/changeset/26245
[2] https://dev.openwrt.org/ticket/10653
Signed-off-by: Jaroslaw Swierczynski <jarek1701@gmail.com>
SVN-Revision: 32567
2012-07-01 11:06:32 +00:00
9ae901445b
/etc/functions.sh => /lib/functions.sh
...
SVN-Revision: 32062
2012-06-05 16:04:23 +00:00
2419c1370a
block-mount: add missing chunk of previous commit
...
SVN-Revision: 31050
2012-03-21 02:29:47 +00:00
88866c9484
block-mount: invoke blkid without cache file, this seems to fix mounts by uuid or label
...
SVN-Revision: 31049
2012-03-21 02:29:26 +00:00
904ecc2159
block-mount: do not auto-mount anonymous mtdblock devices ( fixes #10960 , #10850 )
...
SVN-Revision: 30501
2012-02-13 15:31:31 +00:00
c4e9e4d27e
block-mount: Fixed module loading (double cat is wrong)
...
SVN-Revision: 28717
2011-11-02 18:38:38 +00:00
3bcb16b305
package/blockmount: simplify extroot module loading logic
...
SVN-Revision: 28650
2011-10-28 13:10:50 +00:00
a434ed2fc6
block-mount: remove explicit lock waits, solves some potential race conditions
...
SVN-Revision: 27226
2011-06-19 18:15:14 +00:00
4798e27247
Revert "[package/block-mount] remove example config file"
...
This isn't needed anymore due to commit 27138
SVN-Revision: 27139
2011-06-08 20:45:19 +00:00
4cbdfb6d92
remove example config file
...
Having this file prevents the possibility of having target-specific
fstab config files (as target/linux/${target}/base-files/etc/config/fstab).
There is no need of a non-working example file on the target anyway.
SVN-Revision: 27136
2011-06-08 17:39:16 +00:00
abf0b4b9a2
block-mount: Reverting 26503. Was already fixed in a better way in commit 26474.
...
SVN-Revision: 26505
2011-04-07 01:00:14 +00:00
5f6a87f6c4
block-mount: fsck.sh should only call pi_include() if dir /lib/functions/fsck exists.
...
/etc/functions.sh:pi_include() checks if the argument exists and prints
a warning if not. To prevent this warning if package block-mount is installed
but not package e2fsprogs, the script should check if this directory exists
before calling pi_include()
A wrong patch to suppress this warning was previously posted
with subject:
[PATCH] Fix typo in name of to be included file
Signed-off-by: Mark Vels <mark.vels@team-embedded.nl>
SVN-Revision: 26503
2011-04-06 20:50:06 +00:00
d5542b4f59
block-mount base-files: Added additional check to pi_include to ensure that a directory used with pi_include actually contains files matching the souring pattern because if not the shell dies due to an empty string in for statement. Added /lib/functions/fsck as an empty dir to block-mount. This combination fixes a warning which generates a lot of bug reports, without panicking the kernel like the last attempt.
...
SVN-Revision: 26479
2011-04-05 12:12:57 +00:00
b62e95c11b
block-mount: Revert 26468: it causes a kernel panic due to pi_include failing due to the included directory being empty.
...
SVN-Revision: 26476
2011-04-05 03:19:10 +00:00
c319b73399
block-mount: Removed duplicated directory creation in the package install section. The duplicates were a result of the mergin the block-* packages.
...
SVN-Revision: 26469
2011-04-04 11:30:01 +00:00
581793d2c4
block-mount: Fixed warning of missing /lib/functions/fsck during boot when no scripts are installed in the directory. Thanks to Maarten Bezemer.
...
SVN-Revision: 26468
2011-04-04 11:29:59 +00:00
7f8fb5cb78
block-mount: Merged block-mount, block-extroot, and block-hotplug into a single binary package called block-mount.
...
SVN-Revision: 26314
2011-03-27 06:40:51 +00:00
657d0a265c
block-mount block-extroot: Bump packages versions forgetten during previous two commits
...
SVN-Revision: 26313
2011-03-27 06:02:30 +00:00
9298073e80
block-mount block-extroot: Add commands /etc/init.d/fstab overlay_enable and /etc/init.d/fstab whole_root_enable to renable a disable rootfs.
...
SVN-Revision: 26312
2011-03-27 05:39:53 +00:00
544d1c045e
block-mount block-extroot: Rename /tmp/rom-disabled to /tmp/whole_root-dsibled for disabled mounts of a non-overlay external rootfs.
...
SVN-Revision: 26311
2011-03-27 05:39:47 +00:00
4c85b8562d
block-mount busybox: Removed busybox versions of blkid and swap-utils since they are only used by block-mount and block-extroot, and those packages don't have as much need for the image space-savings of busybox versions, especially at the cost of including it in all images even those with no external storage.
...
SVN-Revision: 26245
2011-03-20 19:37:28 +00:00
9d0b7371e8
block-mount: Changed default filesystem for /e/c/fstab to be ext4 instead of ext3
...
SVN-Revision: 26156
2011-03-14 02:12:38 +00:00
183b4d1a28
extroot: block-mount block-extroot: Added ability to do a whole disk extroot instead of only an overlay-based extroot.
...
SVN-Revision: 26109
2011-03-13 09:24:24 +00:00
47370c1fa4
block-mount: Fixed shell error on empty string due to -eq to number for the optional find_root variable
...
SVN-Revision: 25787
2011-02-28 01:46:46 +00:00
db0bff2724
block-mount,block-extroot: Modify mount.sh so that block-extroot mounts target /overlay as rootfs (use if is_rootfs is now deprecated) when block-extroot is installed, and as /tmp/overlay-disabled otherwise
...
SVN-Revision: 25786
2011-02-28 01:46:24 +00:00
613a513fe4
block-mount: fix fstab.init for IB and buildroot
...
SVN-Revision: 23296
2010-10-07 15:15:54 +00:00
18b473ca9b
base/block-extroot, base/block-mount: Modified preinit and block-extroot and block-mount so that use of block-mount and block-extroot do not require that block-extroot, block-mount, nor the kernel modules they depend, on are required to included in the image. That is block-extroot and dependencies may now be installed as modules onto the jffs2 part of a squashfs system and it will work. In addition packages which are installed into the jffs2 of a squashfs system may now affect preinit, so long as they do not require execution of commands that occur before the merging of the jffs2 and built-in (squashfs) preinit scripts is done.
...
Thanks jow for the preinit merge stuff!
SVN-Revision: 23110
2010-09-23 13:58:05 +00:00
b9dfb5d483
block-mount: Attempt swapon a after mounting as well as before. This ensures that swap on a filesystem is enabled.
...
SVN-Revision: 22150
2010-07-12 17:28:50 +00:00
117590a2ce
block-mount: Fixed two bugs in fstab.init. /etc/fstab was used where /tmp/fstab should have been, and locking was insufficiently careful and was such that it could result in deadlock when hotplug was in use.
...
SVN-Revision: 22148
2010-07-12 16:35:39 +00:00
b6d521ea33
block-mount: Enable swap before doing fsck so that large filesystem checks have swap as well as memory (as they take large memory for large partitions). Closes #7599 .
...
SVN-Revision: 22147
2010-07-12 16:25:09 +00:00
d9e8e8b4ec
block-extroot, block-mount: Fixed multiple bugs which prevented e2fsck from being executed on the external root filesystem before mounting it as root. Added /etc/e2fsck.conf which indicates that the clock is broken (since most OpenWRT devices don't have a battery backed RTC) so that e2fsck will not exit with fatal error when the rdat has not yet been run (i.e. before network).
...
SVN-Revision: 22002
2010-06-30 23:09:13 +00:00
e56dcdcffd
block-mount: Fixed mount deadlocks due to buggy use of locks in /lib/functions/block.sh
...
SVN-Revision: 21987
2010-06-29 10:07:45 +00:00
ed4a1186c6
package/block-mount: mark /etc/config/fstab as conffiles ( closes : #7130 )
...
SVN-Revision: 20875
2010-04-15 07:24:00 +00:00
a98a5a907a
package/block-mount: disable config options altering busybox configuration, fix dependencies
...
SVN-Revision: 20727
2010-04-06 00:52:51 +00:00
bfeb96126d
add the block-mount package by Daniel Dickinson (cshore), replacing existing automount functionality
...
SVN-Revision: 19877
2010-02-26 22:45:39 +00:00
Jo-Philipp Wich
Felix Fietkau
Daniel Dickinson
Nicolas Thill
Mirko Vogt
Vasilis Tsiligiannis