diff options
author | lcapriotti <lcapriotti@svn> | 2010-12-06 09:46:26 +0000 |
---|---|---|
committer | lcapriotti <lcapriotti@svn> | 2010-12-06 09:46:26 +0000 |
commit | 6731ebdb5f7fc91f8630cd86a5b6927bc82b6a77 (patch) | |
tree | c54db39931c350fa20ca3c6aea2e366b0818db2f | |
parent | 60e37d1656ec8d58c967b8feab7c50fbbd4a09e9 (diff) |
Backport: r35583
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma@35584 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
-rwxr-xr-x | tools/Linux/packaging/debian/xbmc-live.postinst | 3 | ||||
-rwxr-xr-x | tools/XBMCLive/SDK/buildLive/Files/chroot_local-hooks/19-setDistroDescription | 25 |
2 files changed, 25 insertions, 3 deletions
diff --git a/tools/Linux/packaging/debian/xbmc-live.postinst b/tools/Linux/packaging/debian/xbmc-live.postinst index ef88000192..c944abf7d0 100755 --- a/tools/Linux/packaging/debian/xbmc-live.postinst +++ b/tools/Linux/packaging/debian/xbmc-live.postinst @@ -203,9 +203,6 @@ ENDOFBLOCK fi done fi - if ! grep -i -q XBMCLive /etc/lsb-release ; then - sed -i -e "/^DISTRIB_DESCRIPTION/s/\"\(.*\)\"/\"\1 - XBMCLive Dharma\"/" /etc/lsb-release - fi # Add <xbmc=autostart,nodiskmount,setvolume loglevel=0> to grub's kernel entries if [ -f /boot/grub/menu.lst ]; then diff --git a/tools/XBMCLive/SDK/buildLive/Files/chroot_local-hooks/19-setDistroDescription b/tools/XBMCLive/SDK/buildLive/Files/chroot_local-hooks/19-setDistroDescription new file mode 100755 index 0000000000..c526e31e42 --- /dev/null +++ b/tools/XBMCLive/SDK/buildLive/Files/chroot_local-hooks/19-setDistroDescription @@ -0,0 +1,25 @@ +#!/bin/bash + +# Copyright (C) 2005-2008 Team XBMC +# http://www.xbmc.org +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with XBMC; see the file COPYING. If not, write to +# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# http://www.gnu.org/copyleft/gpl.html + +echo "" +echo "Customising distro description..." +echo "" + +sed -i -e "/^DISTRIB_DESCRIPTION/s/\"\(.*\)\"/\"\1 - XBMCLive Dharma\"/" /etc/lsb-release |