diff options
| author | James Meyer <james.meyer@operamail.com> | 2009-03-15 20:42:21 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2009-03-15 20:42:21 (GMT) |
| commit | 65970e8b269744cf879172cf07f4a1c5232bb903 (patch) | |
| tree | 86342d58cfaaa9de7a9fdd9280d3f3b13cfc2675 /abs/core-testing/LinHES-config | |
| parent | a92ea834d2195d82bfa1497efd014c79ba155faf (diff) | |
| download | linhes_pkgbuild-65970e8b269744cf879172cf07f4a1c5232bb903.zip linhes_pkgbuild-65970e8b269744cf879172cf07f4a1c5232bb903.tar.gz linhes_pkgbuild-65970e8b269744cf879172cf07f4a1c5232bb903.tar.bz2 | |
Adding support for gnome-screensaver.
Defaults are 10 minutes, no lock , cosmos.
Diffstat (limited to 'abs/core-testing/LinHES-config')
| -rw-r--r-- | abs/core-testing/LinHES-config/PKGBUILD | 2 | ||||
| -rwxr-xr-x | abs/core-testing/LinHES-config/systemconfig.sh | 19 |
2 files changed, 7 insertions, 14 deletions
diff --git a/abs/core-testing/LinHES-config/PKGBUILD b/abs/core-testing/LinHES-config/PKGBUILD index eef4a98..00addde 100644 --- a/abs/core-testing/LinHES-config/PKGBUILD +++ b/abs/core-testing/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=1.0 -pkgrel=307 +pkgrel=314 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev ) pkgdesc="Install and configure your system" depends=(bc libstatgrab mysql-python expect curl dnsutils parted sg3_utils nmbscan system-templates ) diff --git a/abs/core-testing/LinHES-config/systemconfig.sh b/abs/core-testing/LinHES-config/systemconfig.sh index 07ca7c6..16c51f3 100755 --- a/abs/core-testing/LinHES-config/systemconfig.sh +++ b/abs/core-testing/LinHES-config/systemconfig.sh @@ -738,9 +738,9 @@ fi if [ x$XScreensaver = x1 ] then - ser_install="xscreensaver $ser_install" + ser_install="gnome-screensaver $ser_install" else - ser_remove="xscreensaver $ser_remove" + ser_remove="gnome-screensaver $ser_remove" fi @@ -1085,26 +1085,19 @@ function setup_web_auth { function setupXscreensaver { #copy in template - if [ -f /home/mythtv/.xscreensaver ] - then - echo "Xscreensaver already configured" - else - #copy in template - cp $TEMPLATES/xscreensaver.template /home/mythtv/.xscreensaver - chown mythtv:users /home/mythtv/.xscreensaver - fi + #start it if not already running. if [ x$XScreensaver = x1 ] then #check if it's running, it not start it. if [ ! x$MV_NEW_INSTALL = "xtrue" ] then - su - mythtv -c "/usr/bin/xscreensaver -nosplash &" + su - mythtv -c "/usr/bin/gnome-screensaver " fi else #kill it - xscreensaver-command -exit & - killall xscreensaver & + gnome-screensaver-command --exit & + killall gnome-screensaver & fi |