diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2010-02-26 22:45:39 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2010-02-26 22:45:39 +0000 |
| commit | bfeb96126dedec0133b8fc5138225394a3ab3af3 (patch) | |
| tree | 15fc6051ae24767ae1d830fb96f8df8b7064e2a8 /package/base-files | |
| parent | 87298f0de2bf3cfb615c0e6cdeefee58b0534707 (diff) | |
| download | upstream-bfeb96126dedec0133b8fc5138225394a3ab3af3.tar.gz upstream-bfeb96126dedec0133b8fc5138225394a3ab3af3.tar.bz2 upstream-bfeb96126dedec0133b8fc5138225394a3ab3af3.zip | |
add the block-mount package by Daniel Dickinson (cshore), replacing existing automount functionality
SVN-Revision: 19877
Diffstat (limited to 'package/base-files')
| -rw-r--r-- | package/base-files/files/etc/config/fstab | 10 | ||||
| -rw-r--r-- | package/base-files/files/etc/hotplug.d/block/10-mount | 20 | ||||
| -rwxr-xr-x | package/base-files/files/etc/init.d/fstab | 63 |
3 files changed, 0 insertions, 93 deletions
diff --git a/package/base-files/files/etc/config/fstab b/package/base-files/files/etc/config/fstab deleted file mode 100644 index eccf0ce69b..0000000000 --- a/package/base-files/files/etc/config/fstab +++ /dev/null @@ -1,10 +0,0 @@ -config mount - option target /home - option device /dev/sda1 - option fstype ext3 - option options rw,sync - option enabled 0 - -config swap - option device /dev/sda2 - option enabled 0 diff --git a/package/base-files/files/etc/hotplug.d/block/10-mount b/package/base-files/files/etc/hotplug.d/block/10-mount deleted file mode 100644 index 38968933fa..0000000000 --- a/package/base-files/files/etc/hotplug.d/block/10-mount +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -# Copyright (C) 2009-2010 OpenWrt.org - -blkdev=`dirname $DEVPATH` -if [ `basename $blkdev` != "block" ]; then - - device=`basename $DEVPATH` - case "$ACTION" in - add) - swapon /dev/$device >/dev/null 2>/dev/null || ( - mkdir -p /mnt/$device - mount /dev/$device /mnt/$device - ) - ;; - remove) - umount /dev/$device - ;; - esac - -fi diff --git a/package/base-files/files/etc/init.d/fstab b/package/base-files/files/etc/init.d/fstab deleted file mode 100755 index 7d1dffa0bb..0000000000 --- a/package/base-files/files/etc/init.d/fstab +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (C) 2007 OpenWrt.org - -START=20 - -do_mount() { - local cfg="$1" - - config_get device "$cfg" device - config_get target "$cfg" target - [ -n "$device" -a -n "$target" ] || return 0 - - mkdir -p $target - config_get fstype "$cfg" fstype 'auto' - config_get options "$cfg" options '-rw' - config_get_bool enabled "$cfg" "enabled" '1' - [ "$enabled" -eq 0 ] && options="noauto,$options" - echo "$device $target $fstype $options 0 0" >> /tmp/fstab -} - -do_swapon() { - local cfg="$1" - - config_get device "$cfg" device - config_get_bool enabled "$cfg" "enabled" '1' - [ -n "$device" -a "$enabled" -gt 0 ] || return 0 - echo "$device none swap sw 0 0" >> /tmp/fstab -} - -do_unmount() { - local cfg="$1" - - config_get target "$cfg" target - config_get_bool enabled "$cfg" "enabled" '1' - [ -n "$target" -a "$enabled" -gt 0 ] || return 0 - umount $target -} - -do_swapoff() { - local cfg="$1" - - config_get device "$cfg" device - config_get_bool enabled "$cfg" "enabled" '1' - [ -n "$device" -a "$enabled" -gt 0 ] && type swapoff >/dev/null || return 0 - swapoff $device -} - -start() { - config_load fstab - echo '# WARNING: this is an auto generated file, please use uci to set static filesystems' > /tmp/fstab - config_foreach do_mount mount - config_foreach do_swapon swap - mount -a - [ -x /sbin/swapon ] && swapon -a -} - -stop() { - config_load fstab - config_foreach do_unmount mount - config_foreach do_swapoff swap - [ -x /sbin/swapoff ] && swapoff -a -} - |