Commit Graph

27 Commits (3d41f1652c8ab4b0bdd59efea57747b75130e8d3)

Author SHA1 Message Date
Mirko Vogt e0a01a8d87 Revert "[package/block-mount] remove example config file"
This isn't needed anymore due to commit 27138

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27139 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-06-08 20:45:19 +00:00
Mirko Vogt 3c9611d54f [package/block-mount] 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.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27136 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-06-08 17:39:16 +00:00
Daniel Dickinson 4cdfd93618 [package] block-mount: Reverting 26503. Was already fixed in a better way in commit 26474.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26505 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-04-07 01:00:14 +00:00
Vasilis Tsiligiannis 620f280b13 [package] 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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26503 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-04-06 20:50:06 +00:00
Daniel Dickinson a353e17d8f [package] 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.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26479 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-04-05 12:12:57 +00:00
Daniel Dickinson 3f7ddd92ae [package] block-mount: Revert 26468: it causes a kernel panic due to pi_include failing due to the included directory being empty.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26476 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-04-05 03:19:10 +00:00
Daniel Dickinson daa6144457 [package] block-mount: Removed duplicated directory creation in the package install section. The duplicates were a result of the mergin the block-* packages.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26469 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-04-04 11:30:01 +00:00
Daniel Dickinson f02b185301 [package] block-mount: Fixed warning of missing /lib/functions/fsck during boot when no scripts are installed in the directory. Thanks to Maarten Bezemer.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26468 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-04-04 11:29:59 +00:00
Daniel Dickinson 012ea4a5a3 [package] block-mount: Merged block-mount, block-extroot, and block-hotplug into a single binary package called block-mount.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26314 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-03-27 06:40:51 +00:00
Daniel Dickinson 116c7cd9be [package] block-mount block-extroot: Bump packages versions forgetten during previous two commits
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26313 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-03-27 06:02:30 +00:00
Daniel Dickinson 9cd9cb7dfd [package] 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.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26312 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-03-27 05:39:53 +00:00
Daniel Dickinson b0b0d71a54 [package] block-mount block-extroot: Rename /tmp/rom-disabled to /tmp/whole_root-dsibled for disabled mounts of a non-overlay external rootfs.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26311 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-03-27 05:39:47 +00:00
Daniel Dickinson 8537d742ba [package] 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.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26245 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-03-20 19:37:28 +00:00
Daniel Dickinson 0d27fd5834 [package] block-mount: Changed default filesystem for /e/c/fstab to be ext4 instead of ext3
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26156 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-03-14 02:12:38 +00:00
Daniel Dickinson 2edddd450b [package] extroot: block-mount block-extroot: Added ability to do a whole disk extroot instead of only an overlay-based extroot.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26109 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-03-13 09:24:24 +00:00
Daniel Dickinson 7f21b3000c [package] block-mount: Fixed shell error on empty string due to -eq to number for the optional find_root variable
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25787 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-02-28 01:46:46 +00:00
Daniel Dickinson b2321ba263 [package] 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
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25786 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-02-28 01:46:24 +00:00
Jo-Philipp Wich f4b397e9f8 [package] block-mount: fix fstab.init for IB and buildroot
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23296 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-10-07 15:15:54 +00:00
Daniel Dickinson ce5a30ba10 [package] 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!



git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23110 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-09-23 13:58:05 +00:00
Daniel Dickinson 9930188d22 [package] block-mount: Attempt swapon a after mounting as well as before. This ensures that swap on a filesystem is enabled.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22150 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-07-12 17:28:50 +00:00
Daniel Dickinson efa3beb78b [package]: 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.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22148 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-07-12 16:35:39 +00:00
Daniel Dickinson d2f3a21390 [package]: 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.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22147 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-07-12 16:25:09 +00:00
Daniel Dickinson fe638dc0ed 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).
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22002 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-06-30 23:09:13 +00:00
Daniel Dickinson c0edae12e1 block-mount: Fixed mount deadlocks due to buggy use of locks in /lib/functions/block.sh
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21987 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-06-29 10:07:45 +00:00
Nicolas Thill be605d9141 package/block-mount: mark /etc/config/fstab as conffiles (closes: #7130)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20875 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-15 07:24:00 +00:00
Nicolas Thill d21b23ab5e package/block-mount: disable config options altering busybox configuration, fix dependencies
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20727 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-06 00:52:51 +00:00
Felix Fietkau 3d97332bd2 add the block-mount package by Daniel Dickinson (cshore), replacing existing automount functionality
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19877 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-02-26 22:45:39 +00:00