Permalink
Browse files

Hide the XO-1.5 internal card in Saluki

  • Loading branch information...
1 parent 860d9fa commit 70bf9d1cbf2a83e2343401963427f602f95856b9 @mavrothal committed Apr 7, 2012
Showing with 40 additions and 0 deletions.
  1. +30 −0 XO/XO_sfs_patches/frontend_d-luki.patch
  2. +10 −0 create_xo_puppy.sh
@@ -0,0 +1,30 @@
+--- a/sbin/pup_event_frontend_d 2012-03-23 06:16:33.000000000 +0200
++++ b/sbin/pup_event_frontend_d 2012-04-07 09:13:53.000000000 +0300
+@@ -661,7 +661,17 @@
+ create_icon_func #needs DRV_NAME, DRV_CATEGORY, DRV_DESCRIPTION.
+ else
+ #show all drives on desktop... w476 add ext4...
+- PROBEPART="`probepart -k | grep -E '\|ext4\||\|ntfs\||\|msdos\||\|udf\||\|vfat\||\|ext2\||\|ext3\||\|iso9660\||\|xfs\||\|reiser'`"
++ # Hide the XO-1.5 internal sd
++ XOVER=`uname -r | cut -f 1 -d '-' | rev | cut -f 1 -d '_'| rev`
++ if [ "$XOVER" = "xo1.5" ] ; then
++ if [ "$PDEV1" = "sda1" ] && [ "`probedisk | grep mmcblk1`" = "" ] ; then
++ PROBEPART="`probepart -k | grep -E '\|ext4\||\|ntfs\||\|msdos\||\|udf\||\|vfat\||\|ext2\||\|ext3\||\|iso9660\||\|xfs\||\|reiser' | sed -e 's/\/dev\/mmcblk0p1//g' | sed -e 's/\/dev\/mmcblk0p2//g'`"
++ else
++ PROBEPART="`probepart -k | grep -E '\|ext4\||\|ntfs\||\|msdos\||\|udf\||\|vfat\||\|ext2\||\|ext3\||\|iso9660\||\|xfs\||\|reiser' | sed -e 's/\/dev\/mmcblk1p1//g' | sed -e 's/\/dev\/mmcblk1p2//g'`"
++ fi
++ else
++ PROBEPART="`probepart -k | grep -E '\|ext4\||\|ntfs\||\|msdos\||\|vfat\||\|ext2\||\|ext3\||\|iso9660\||\|xfs\||\|reiser'`"
++ fi
+ if [ "$FD0ICON" = "true" ];then #see /etc/eventmanager
+ if [ -e /sys/block/fd0 ];then
+ PROBEDISK="/dev/fd0|floppy|Legacy floppy drive
+@@ -786,7 +796,7 @@
+
+ #######four second timeout procesing#########
+ SAVECNT=`expr $SAVECNT + 4`
+- if [ $RAMSAVEINTERVAL -ne 0 -a $SAVECNT -gt $RAMSAVEINTERVAL ];then
++ if [ $RAMSAVEINTERVAL -ne 0 -a $SAVECNT -gt $RAMSAVEINTERVAL ] && [ ! -f /tmp/sleeping.now ];then #stop merge request when in suspend
+ touch /tmp/snapmergepuppyrequest #request to savepuppy_func.
+ SAVECNT=0
+ fi
View
@@ -646,6 +646,16 @@ cat << EOF >> $SFSROOT/root/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.x
</channel>
EOF
+# Patch frontend_d which differs in Saluki
+echo "patching pup_event_frontend_d"
+patch -p1 < $patches/frontend_d-luki.patch
+if [ $? -ne 0 ]; then
+ echo "Failed to patch pup_event_frontend_d in Saluki. $(date "+%Y-%m-%d %H:%M")" >> $CWD/build.log
+ rm -f sbin/pup_event_frontend_d.{orig,rej}
+else
+ echo "Patched pup_event_frontend_d in Saluki. $(date "+%Y-%m-%d %H:%M")" >> $CWD/build.log
+fi
+
# Fix the suspend/hibernate calls (Saluki)
sed -i 's/\/etc\/acpi\/hibernate\.sh/powerd-config =gotosleep/' $SFSROOT/usr/bin/shutdown-gui
sed -i 's/\/etc\/acpi\/sleep\.sh/powerd-config =dark-suspend/' $SFSROOT/usr/bin/shutdown-gui

0 comments on commit 70bf9d1

Please sign in to comment.