1 |
axs 12/06/22 18:57:34 |
2 |
|
3 |
Modified: ChangeLog user.eclass |
4 |
Log: |
5 |
esethome: eerror and not die when home dir cannot be updated, due to for instance user being in use |
6 |
|
7 |
Revision Changes Path |
8 |
1.326 eclass/ChangeLog |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.326&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.326&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.325&r2=1.326 |
13 |
|
14 |
Index: ChangeLog |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
17 |
retrieving revision 1.325 |
18 |
retrieving revision 1.326 |
19 |
diff -u -r1.325 -r1.326 |
20 |
--- ChangeLog 22 Jun 2012 15:14:10 -0000 1.325 |
21 |
+++ ChangeLog 22 Jun 2012 18:57:33 -0000 1.326 |
22 |
@@ -1,6 +1,10 @@ |
23 |
# ChangeLog for eclass directory |
24 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.325 2012/06/22 15:14:10 axs Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.326 2012/06/22 18:57:33 axs Exp $ |
27 |
+ |
28 |
+ 22 Jun 2012; Ian Stakenvicius <axs@g.o> user.eclass: |
29 |
+ esethome: eerror and not die when home dir cannot be updated, due to for |
30 |
+ instance user being in use |
31 |
|
32 |
22 Jun 2012; Ian Stakenvicius <axs@g.o> user.eclass: |
33 |
fixed esethome, directory must exist befure user record can be updated |
34 |
|
35 |
|
36 |
|
37 |
1.21 eclass/user.eclass |
38 |
|
39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/user.eclass?rev=1.21&view=markup |
40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/user.eclass?rev=1.21&content-type=text/plain |
41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/user.eclass?r1=1.20&r2=1.21 |
42 |
|
43 |
Index: user.eclass |
44 |
=================================================================== |
45 |
RCS file: /var/cvsroot/gentoo-x86/eclass/user.eclass,v |
46 |
retrieving revision 1.20 |
47 |
retrieving revision 1.21 |
48 |
diff -u -r1.20 -r1.21 |
49 |
--- user.eclass 22 Jun 2012 15:14:10 -0000 1.20 |
50 |
+++ user.eclass 22 Jun 2012 18:57:33 -0000 1.21 |
51 |
@@ -1,6 +1,6 @@ |
52 |
# Copyright 1999-2012 Gentoo Foundation |
53 |
# Distributed under the terms of the GNU General Public License v2 |
54 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/user.eclass,v 1.20 2012/06/22 15:14:10 axs Exp $ |
55 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/user.eclass,v 1.21 2012/06/22 18:57:33 axs Exp $ |
56 |
|
57 |
# @ECLASS: user.eclass |
58 |
# @MAINTAINER: |
59 |
@@ -439,14 +439,21 @@ |
60 |
;; |
61 |
|
62 |
*-freebsd*|*-dragonfly*) |
63 |
- pw usermod "${euser}" -d "${ehome}" || die |
64 |
+ pw usermod "${euser}" -d "${ehome}" && return 0 |
65 |
+ [[ $? == 8 ]] && eerror "${euser} is in use, cannot update home" |
66 |
+ eerror "There was an error when attempting to update the home directory for ${euser}" |
67 |
+ eerror "Please update it manually on your system:" |
68 |
+ eerror "\t pw usermod \"${euser}\" -d \"${ehome}\"" |
69 |
;; |
70 |
|
71 |
*) |
72 |
- usermod -d "${ehome}" "${euser}" || die |
73 |
+ usermod -d "${ehome}" "${euser}" && return 0 |
74 |
+ [[ $? == 8 ]] && eerror "${euser} is in use, cannot update home" |
75 |
+ eerror "There was an error when attempting to update the home directory for ${euser}" |
76 |
+ eerror "Please update it manually on your system (as root):" |
77 |
+ eerror "\t usermod -d \"${ehome}\" \"${euser}\"" |
78 |
;; |
79 |
esac |
80 |
- |
81 |
} |
82 |
|
83 |
fi |