diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 11:16:26 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 11:17:34 +0200 |
| commit | 8f3142f161895b5fb02c12d1a4a6e5eec8e861d6 (patch) | |
| tree | 375c50c730181ea19da5e3524571f8f790bec2ea /package/base-files | |
| parent | 47a24fe6d4f5397ccca6bc3573af3017ba7acd4e (diff) | |
remove, not needed and fails in nfsroot case
Diffstat (limited to 'package/base-files')
| -rw-r--r-- | package/base-files/Makefile | 2 | ||||
| -rwxr-xr-x | package/base-files/src/etc/init.d/fs | 26 |
2 files changed, 3 insertions, 25 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 74ece91e8..1043e0d0d 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk PKG_NAME:= base-files PKG_VERSION:= 1.0 -PKG_RELEASE:= 93 +PKG_RELEASE:= 94 PKG_SECTION:= base PKG_DESCR:= basic files and scripts diff --git a/package/base-files/src/etc/init.d/fs b/package/base-files/src/etc/init.d/fs index 72beb40b3..993977b71 100755 --- a/package/base-files/src/etc/init.d/fs +++ b/package/base-files/src/etc/init.d/fs @@ -18,32 +18,10 @@ lvm vgchange -ay } -rootdisk=$(readlink /dev/root) -# strip partitions (f.e. mmcblk0p2, sda2, ..) -rootdisk=${rootdisk%p*} -rootdisk=${rootdisk%[1-9]} -rootparts=$(grep "^/dev/${rootdisk}" /etc/fstab|awk '{ print $1 }') - -for part in $rootparts; do - fstype=$(grep "^$part " /etc/fstab|awk '{ print $3 }') - mnt=$(grep "^$part " /etc/fstab|awk '{ print $2 }') - [ -x /usr/sbin/fsck.$fstype ] && { - logger -s -t '' "Checking $fstype filesystem on $part" - fsck $part - } - grep $fstype /proc/filesystems >/dev/null 2>&1 - if [ $? -eq 0 ];then - mount $mnt - else - logger -s "Filesystem $fstype not in kernel" - exit 1 - fi -done - -# mount local filesystems not rootdisk +# mount local filesystems fstypes="ext2 ext3 ext4 xfs vfat ntfs" for fs in $fstypes; do - disks=$(grep -v "^#" /etc/fstab| grep -v $rootdisk |grep $fs|awk '{ print $1 }' >/dev/null 2>&1) + disks=$(grep -v "^#" /etc/fstab|grep $fs|awk '{ print $1 }' >/dev/null 2>&1) for disk in $disks; do logger -t '' "Found $disk with filesystem $fs" grep $fs /proc/filesystems >/dev/null 2>&1 |