[arch-commits] Commit in x2goserver/trunk (PKGBUILD x2goserver.install)

[andyrtr at archlinux.org]

    Date: Saturday, January 19, 2013 @ 12:55:46
  Author: andyrtr
Revision: 175693

upgpkg: x2goserver 4.0.0.0-4

fix module loading (FS#33462) and user login in install scriptlet

Modified:
  x2goserver/trunk/PKGBUILD
  x2goserver/trunk/x2goserver.install

--------------------+
 PKGBUILD           |    6 +++---
 x2goserver.install |    8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-01-19 17:54:24 UTC (rev 175692)
+++ PKGBUILD	2013-01-19 17:55:46 UTC (rev 175693)
@@ -8,7 +8,7 @@
 
 pkgname=x2goserver
 pkgver=4.0.0.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Open source terminal server"
 arch=('i686' 'x86_64')
 url="http://www.x2go.org/"
@@ -54,8 +54,8 @@
   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"

Modified: x2goserver.install
===================================================================
--- x2goserver.install	2013-01-19 17:54:24 UTC (rev 175692)
+++ x2goserver.install	2013-01-19 17:55:46 UTC (rev 175693)
@@ -18,9 +18,9 @@
   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 @@
   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