[gentoo-commits] gentoo-x86 commit in net-misc/nxserver-freenx: nxserver-freenx-0.7.1.ebuild ChangeLog

[Bernard Cafarelli (voyageur)]

voyageur    07/11/01 23:49:24

  Modified:             nxserver-freenx-0.7.1.ebuild ChangeLog
  Log:
  Check ${ROOT} before issuing usermod commands
  (Portage version: 2.1.3.16)

Revision  Changes    Path
1.2                  net-misc/nxserver-freenx/nxserver-freenx-0.7.1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.7.1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.7.1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.7.1.ebuild?r1=1.1&r2=1.2

Index: nxserver-freenx-0.7.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.7.1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nxserver-freenx-0.7.1.ebuild	31 Oct 2007 19:49:54 -0000	1.1
+++ nxserver-freenx-0.7.1.ebuild	1 Nov 2007 23:49:24 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.7.1.ebuild,v 1.1 2007/10/31 19:49:54 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.7.1.ebuild,v 1.2 2007/11/01 23:49:24 voyageur Exp $
 
 inherit multilib eutils
 
@@ -114,8 +114,17 @@
 }
 
 pkg_postinst () {
-	usermod -s /usr/bin/nxserver nx || die "Unable to set login shell of nx user!!"
-	usermod -d ${NX_HOME_DIR} nx || die "Unable to set home directory of nx user!!"
+	# Other NX servers ebuilds may have already created the nx account
+	# However they use different login shell/home directory paths
+	if [[ ${ROOT} == "/" ]]; then
+		usermod -s /usr/bin/nxserver nx || die "Unable to set login shell of nx user!!"
+		usermod -d ${NX_HOME_DIR} nx || die "Unable to set home directory of nx user!!"
+	else
+		elog "If you had another NX server installed before, please make sure"
+		elog "the nx user account is correctly set to:"
+		elog " * login shell: /usr/bin/nxserver"
+		elog " * home directory: ${NX_HOME_DIR}"
+	fi
 
 	elog "To complete the installation, run:"
 	elog " nxsetup --install --setup-nomachine-key --clean --purge"



1.35                 net-misc/nxserver-freenx/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/nxserver-freenx/ChangeLog?rev=1.35&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/nxserver-freenx/ChangeLog?rev=1.35&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/nxserver-freenx/ChangeLog?r1=1.34&r2=1.35

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ChangeLog	31 Oct 2007 19:49:54 -0000	1.34
+++ ChangeLog	1 Nov 2007 23:49:24 -0000	1.35
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/nxserver-freenx
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.34 2007/10/31 19:49:54 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/ChangeLog,v 1.35 2007/11/01 23:49:24 voyageur Exp $
+
+  01 Nov 2007; Bernard Cafarelli <voyageur@g.o>
+  nxserver-freenx-0.7.1.ebuild:
+  Check ${ROOT} before issuing usermod commands
 
 *nxserver-freenx-0.7.1 (31 Oct 2007)
 



-- 
gentoo-commits@g.o mailing list