diff options
| author | root <root@rshg054.dnsready.net> | 2013-01-20 00:52:25 -0800 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-01-20 00:52:25 -0800 |
| commit | 949fa4e5ed405aaddcebff7e21008f03cdffa580 (patch) | |
| tree | 8178ba1e77fb2359541090bac532c8142f63cdef /extra/x2goserver | |
| parent | 3ed92d43351cfc0eeccb646d7726ef07cdeae33b (diff) | |
Sun Jan 20 00:52:22 PST 2013
Diffstat (limited to 'extra/x2goserver')
| -rw-r--r-- | extra/x2goserver/PKGBUILD | 15 | ||||
| -rw-r--r-- | extra/x2goserver/x2goserver.install | 8 |
2 files changed, 10 insertions, 13 deletions
diff --git a/extra/x2goserver/PKGBUILD b/extra/x2goserver/PKGBUILD index fa620c2cf..3f483146d 100644 --- a/extra/x2goserver/PKGBUILD +++ b/extra/x2goserver/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 175061 2013-01-12 11:27:40Z andyrtr $ +# $Id: PKGBUILD 175694 2013-01-19 17:56:40Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Gerhard Brauer <gerbra@archlinux.de> @@ -8,7 +8,7 @@ pkgname=x2goserver pkgver=4.0.0.0 -pkgrel=2 +pkgrel=4 pkgdesc="Open source terminal server" arch=('i686' 'x86_64') url="http://www.x2go.org/" @@ -49,18 +49,15 @@ package() { install -Dm 644 "$srcdir/x2goserver.service" "$pkgdir/usr/lib/systemd/system/x2goserver.service" # X2go homedir + printing spool dir - install -dm 755 $pkgdir/var/lib/x2go + #install -dm 755 $pkgdir/var/lib/x2go + install -dm 770 $pkgdir/var/lib/x2go install -dm 755 $pkgdir/var/spool/x2go # load fuse module at system start - install -dm755 $pkgdir/usr/lib/modprobe.d - echo "fuse" > $pkgdir/usr/lib/modprobe.d/x2goserver.conf + install -dm755 $pkgdir/lib/modules-load.d + echo "fuse" > $pkgdir/lib/modules-load.d/x2goserver.conf install -dm 755 "${pkgdir}/usr/share/doc/${pkgname}" install -m 644 "debian/changelog" "${pkgdir}/usr/share/doc/${pkgname}/changelog.DEBIAN" install -m 644 "debian/copyright" "${pkgdir}/usr/share/doc/${pkgname}/copyright.DEBIAN" - - # cleanup unneded files/directories - rmdir $pkgdir/etc/X11/Xsession.d - rm -f $pkgdir/etc/x2go/Xresources } diff --git a/extra/x2goserver/x2goserver.install b/extra/x2goserver/x2goserver.install index 0688960cc..cac06dac8 100644 --- a/extra/x2goserver/x2goserver.install +++ b/extra/x2goserver/x2goserver.install @@ -18,9 +18,9 @@ post_install() { fi if grep -q "^x2gouser:" /etc/passwd 2> /dev/null ; then - usermod -s /sbin/false -c "X2GoUser user" -M -d /var/lib/x2go -u 111 -g x2gouser x2gouser &> /dev/null + usermod -s /usr/bin/false -c "X2GoUser user" -M -d /var/lib/x2go -u 111 -g x2gouser x2gouser &> /dev/null else - useradd -s /sbin/false -c "X2GoUser user" -M -d /var/lib/x2go -u 111 -g x2gouser -r x2gouser &> /dev/null + useradd -s /usr/bin/false -c "X2GoUser user" -M -d /var/lib/x2go -u 111 -g x2gouser -r x2gouser &> /dev/null fi # x2goprint @@ -31,9 +31,9 @@ post_install() { fi if grep -q "^x2goprint:" /etc/passwd 2> /dev/null ; then - usermod -s /sbin/false -c "X2GoPrint user" -M -d /var/spool/x2go -u 112 -g x2goprint x2goprint &> /dev/null + usermod -s /usr/bin/false -c "X2GoPrint user" -M -d /var/spool/x2go -u 112 -g x2goprint x2goprint &> /dev/null else - useradd -s /sbin/false -c "X2GoPrint user" -M -d /var/spool/x2go -u 112 -g x2goprint -r x2goprint &> /dev/null + useradd -s /usr/bin/false -c "X2GoPrint user" -M -d /var/spool/x2go -u 112 -g x2goprint -r x2goprint &> /dev/null fi # fix permissions - see INSTALL file |