diff options
| author | Firerat <firer4t@googlemail.com> | 2010-08-23 18:56:32 +0100 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2010-09-19 15:30:05 -0400 |
| commit | c74211374a2f93878ffc87c53fbe54bd57a7d445 (patch) | |
| tree | 139c83dc3082d4929f158575e7756338c98c8cf2 | |
| parent | 319b0392f14927c0f7c307e3f37a054bf3ffd053 (diff) | |
| download | vendor_replicant-c74211374a2f93878ffc87c53fbe54bd57a7d445.zip vendor_replicant-c74211374a2f93878ffc87c53fbe54bd57a7d445.tar.gz vendor_replicant-c74211374a2f93878ffc87c53fbe54bd57a7d445.tar.bz2 | |
install init.d/05mountsd script, with correct e2fsck exitcode
| -rwxr-xr-x | prebuilt/common/etc/init.d/05mountsd | 13 | ||||
| -rw-r--r-- | products/common.mk | 4 |
2 files changed, 11 insertions, 6 deletions
diff --git a/prebuilt/common/etc/init.d/05mountsd b/prebuilt/common/etc/init.d/05mountsd index f53645f..8315466 100755 --- a/prebuilt/common/etc/init.d/05mountsd +++ b/prebuilt/common/etc/init.d/05mountsd @@ -30,11 +30,16 @@ then log -p i -t mountsd "Checking filesystems.."; # fsck the sdcard filesystem first - logwrapper e2fsck -y $PARTITION; - + if [ -x `which e2fsck` ]; + then + e2fsck -y $PARTITION;e2fsk_exitcode=$? + else + echo "executable e2fsck not found, assuming no filesystem errors" + e2fsk_exitcode=0 + fi # set property with exit code in case an error occurs - setprop cm.e2fsck.errors $?; - if [ "$?" = 0 ]; + setprop cm.e2fsck.errors $e2fsk_exitcode; + if [ "$e2fsk_exitcode" = 0 ]; then # mount and set perms diff --git a/products/common.mk b/products/common.mk index 3131762..7ac9c17 100644 --- a/products/common.mk +++ b/products/common.mk @@ -78,8 +78,8 @@ PRODUCT_COPY_FILES += \ vendor/cyanogen/prebuilt/common/xbin/powertop:system/xbin/powertop \ vendor/cyanogen/prebuilt/common/xbin/openvpn-up.sh:system/xbin/openvpn-up.sh -#PRODUCT_COPY_FILES += \ -# vendor/cyanogen/prebuilt/common/etc/init.d/05mountsd:system/etc/init.d/05mountsd \ +PRODUCT_COPY_FILES += \ + vendor/cyanogen/prebuilt/common/etc/init.d/05mountsd:system/etc/init.d/05mountsd # vendor/cyanogen/prebuilt/common/etc/init.d/10apps2sd:system/etc/init.d/10apps2sd PRODUCT_COPY_FILES += \ |