From 4601476c19fd64707560825cae2d702976a5591c Mon Sep 17 00:00:00 2001 From: root Date: Thu, 10 May 2012 14:48:53 +0200 Subject: [PATCH] rootfs: (arm) disable postplug filesystem check to prevent a crash seen in Hannspad sdk-root: add icecc --- platforms/rootfs/post.inc.sh | 6 ++++++ platforms/sdk-root/Makefile | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/platforms/rootfs/post.inc.sh b/platforms/rootfs/post.inc.sh index c3d6dda..8ab0479 100644 --- a/platforms/rootfs/post.inc.sh +++ b/platforms/rootfs/post.inc.sh @@ -121,6 +121,12 @@ for f in ChangeLog Changelog CHANGES TODO NEWS README README.txt; do find $MOUNTDIR/usr/share/doc -name $f -exec rm -f {} \; done +# disable filesystem autocheck due to a kernel bug in hannspad (blkid generated kernel crash) +if [ "$ARCH" = "arm" ]; then + sed -i "s|FS_PARTS_UPDATE=yes|FS_PARTS_UPDATE=no|" $MOUNTDIR/etc/sysconfig/postplug + sed -i "s|FS_SWAP_UPDATE=yes|FS_SWAP_UPDATE=no|" $MOUNTDIR/etc/sysconfig/postplug +fi + # FIXME: this should be done by postplug only when touchscreen is detected mkdir -p $MOUNTDIR/home/liveuser/.icons/default cat > $MOUNTDIR/home/liveuser/.icons/default/index.theme << _EOF diff --git a/platforms/sdk-root/Makefile b/platforms/sdk-root/Makefile index 0bf66ac..21c31be 100644 --- a/platforms/sdk-root/Makefile +++ b/platforms/sdk-root/Makefile @@ -12,7 +12,7 @@ $(MAKEDIST_TARGET)-sdk-root: openssh-server usbutils wireless_tools parted \ tcpdump pcmcia-utils xdg-utils iproute syslog-ng \ rpm autospec autodist nfs-utils patch sudo smart \ pkgconfig diffutils autoconf automake libtool gettext xorg-server \ - tightvnc-server lxde midori $(MAKEDIST_TARGET)-devel + tightvnc-server lxde midori $(MAKEDIST_TARGET)-devel icecc $(MAKEDIST_TARGET)-sdk-root-missing: wpa_supplicant dosfstools cups vim postplug ipw2100-firmware ipw2200-firmware zd1211-firmware \ rt2501-firmware rt2870-firmware b43-tools r5u87x-firmware mdadm \ ndiswrapper slmodem unionfs_utils nfs-utils mbr