Pastebin launched a little side project called VERYVIRAL.com, check it out ;-) Want more features on Pastebin? Sign Up, it's FREE!
Guest

Untitled

By: a guest on Jul 13th, 2011  |  syntax: Diff  |  size: 3.22 KB  |  views: 152  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. diff -ruw fbsplash.orig//PKGBUILD fbsplash//PKGBUILD
  2. --- fbsplash.orig//PKGBUILD     2011-07-12 18:34:08.000000000 +0200
  3. +++ fbsplash//PKGBUILD  2011-07-13 10:22:03.000000000 +0200
  4. @@ -3,7 +3,7 @@
  5.  
  6.  pkgname=fbsplash
  7.  pkgver=1.5.4.4
  8. -pkgrel=4
  9. +pkgrel=5
  10.  pkgdesc="A userspace implementation of a splash screen for Linux (formerly known as gensplash)"
  11.  arch=('i686' 'x86_64')
  12.  url="http://fbsplash.berlios.de"
  13. @@ -28,9 +28,9 @@
  14.  md5sums=('2a16704c4adde97b58812cd89e3f2342'
  15.           '4045e315c52f5a576fca4f7e634eeb91'
  16.           '90708a96038d7d7921c2e9fde938c058'
  17. -         '40622506e64a0919e831d3dc3a6ae230'
  18. +         'a6b0b9c5c7a460380a7db127e0278164'
  19.           '24e2a7bbc2d18fe3ec10093665cd7a6e'
  20. -         'c2b2803264b412646bf3453bcd60fb34'
  21. +         '4a3ac992a5042fa9770cbd3fdb7e1465'
  22.           '715926469d05eecd345c052e6248ca32'
  23.           'b3db9d4fd902b62ac9e38589677e2d16')
  24.  
  25. diff -ruw fbsplash.orig//fbsplash-basic.sh fbsplash//fbsplash-basic.sh
  26. --- fbsplash.orig//fbsplash-basic.sh    2011-06-22 12:30:23.000000000 +0200
  27. +++ fbsplash//fbsplash-basic.sh 2011-07-13 10:19:25.000000000 +0200
  28. @@ -40,8 +40,8 @@
  29.         # Prevent splash destruction
  30.         CONSOLEFONT=""
  31.         # Continue to use a splash daamon started in initcpio
  32. -       if /bin/mountpoint -q /dev/.splash-cache; then
  33. -               /bin/mount --move /dev/.splash-cache $spl_cachedir || return
  34. +       if /bin/mountpoint -q /run/.splash-cache; then
  35. +               /bin/mount --move /run/.splash-cache $spl_cachedir || return
  36.                 splash_comm_send set message "$SPLASH_BOOT_MESSAGE"
  37.         # Mount a tmpfs
  38.         else
  39. diff -ruw fbsplash.orig//fbsplash.initcpio_hook fbsplash//fbsplash.initcpio_hook
  40. --- fbsplash.orig//fbsplash.initcpio_hook       2011-07-12 18:32:55.000000000 +0200
  41. +++ fbsplash//fbsplash.initcpio_hook    2011-07-13 10:13:48.000000000 +0200
  42. @@ -12,31 +12,31 @@
  43.  
  44.                 # Start the daemon here if possible
  45.                 # to show animations early and gain some bootup speed
  46. -               if [ -x /sbin/fbsplashd.static ]; then
  47. +               if [ -x "$spl_daemon" ]; then
  48.                         msg "Starting Fbsplash Daemon"
  49.                         set -e
  50. -                       # Mount the cache within /dev to get it moved to the new root
  51. -                       mkdir /dev/.splash-cache
  52. -                       ( spl_cachedir=/dev/.splash-cache; splash_cache_prep )
  53. +                       # Mount the cache within /run to get it moved to the new root
  54. +                       mkdir /run/.splash-cache
  55. +                       ( spl_cachedir=/run/.splash-cache; splash_cache_prep )
  56.                         # Take over any existing cache content
  57.                         mkdir -p $spl_cachedir
  58.                         parent=$( dirname $spl_cachedir )
  59.                         mv $spl_cachedir $parent/.splash-cache
  60. -                       cp -a $parent/.splash-cache /dev/
  61. +                       cp -a $parent/.splash-cache /run/
  62.                         # Symlink for starting the daemon
  63. -                       ln -s /dev/.splash-cache $spl_cachedir
  64. +                       ln -s /run/.splash-cache $spl_cachedir
  65.                         # Wait for any fbcondecor fadein - may take very long on some broken systems
  66.                         i=0
  67.                         while [ -n "$( pidof fbcondecor_helper )" ]; do
  68.                                 if [ $i -ge 50 ]; then
  69. -                                       error "timeout on waiting for fbcondecor_helper to die!"
  70. +                                       err "timeout on waiting for fbcondecor_helper to die!"
  71.                                         exit 1
  72.                                 fi
  73.                                 sleep .1
  74.                                 i=$(( i + 1 ))
  75.                         done
  76.                         # Actually start the daemon
  77. -                       cd /dev/.splash-cache
  78. +                       cd /run/.splash-cache
  79.                         set +e
  80.                         SPLASH_BOOT_MESSAGE="${SPLASH_INIT_MESSAGE}"
  81.                         splash_start && sleep .1 # allow the daemon to open the event dev
clone this paste RAW Paste Data