1*4882a593SmuzhiyunFrom 55a0adfc416ad85dbc440eaa667d98c200a8ce62 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Jackie Huang <jackie.huang@windriver.com> 3*4882a593SmuzhiyunDate: Thu, 18 Dec 2014 17:23:37 +0800 4*4882a593SmuzhiyunSubject: [PATCH] adduser: add -M option for useradd 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunThe useradd (from package passwd) in debian based system sets -M (--no-create-home) by default, 7*4882a593Smuzhiyunbut the one we are using (from package shadow) sets -m (--create-home) by default, so we 8*4882a593Smuzhiyunneed to explicitly add -M option for useradd call or it will try to create home twice and 9*4882a593Smuzhiyunthrow a confused message: 10*4882a593Smuzhiyun"The home directory `/home/newuser' already exists. Not copying from `/etc/skel'" 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunUpstream-Status: Submitted [1] 13*4882a593Smuzhiyun 14*4882a593Smuzhiyun[1] https://lists.alioth.debian.org/pipermail/adduser-devel/2016-October/005478.html 15*4882a593Smuzhiyun 16*4882a593SmuzhiyunSigned-off-by: Jackie Huang <jackie.huang@windriver.com> 17*4882a593Smuzhiyun--- 18*4882a593Smuzhiyun adduser | 4 ++-- 19*4882a593Smuzhiyun 1 file changed, 2 insertions(+), 2 deletions(-) 20*4882a593Smuzhiyun 21*4882a593Smuzhiyundiff --git a/adduser b/adduser 22*4882a593Smuzhiyunindex a5f83f3..f6cb52c 100755 23*4882a593Smuzhiyun--- a/adduser 24*4882a593Smuzhiyun+++ b/adduser 25*4882a593Smuzhiyun@@ -435,7 +435,7 @@ if ($action eq "addsysuser") { 26*4882a593Smuzhiyun $undouser = $new_name; 27*4882a593Smuzhiyun my $useradd = &which('useradd'); 28*4882a593Smuzhiyun &systemcall($useradd, '-d', $home_dir, '-g', $ingroup_name, '-s', 29*4882a593Smuzhiyun- $shell, '-u', $new_uid, $new_name); 30*4882a593Smuzhiyun+ $shell, '-u', $new_uid, '-M', $new_name); 31*4882a593Smuzhiyun if(!$disabled_login) { 32*4882a593Smuzhiyun my $usermod = &which('usermod'); 33*4882a593Smuzhiyun &systemcall($usermod, '-p', '*', $new_name); 34*4882a593Smuzhiyun@@ -525,7 +525,7 @@ if ($action eq "adduser") { 35*4882a593Smuzhiyun $undouser = $new_name; 36*4882a593Smuzhiyun my $useradd = &which('useradd'); 37*4882a593Smuzhiyun &systemcall($useradd, '-d', $home_dir, '-g', $ingroup_name, '-s', 38*4882a593Smuzhiyun- $shell, '-u', $new_uid, $new_name); 39*4882a593Smuzhiyun+ $shell, '-u', $new_uid, '-M', $new_name); 40*4882a593Smuzhiyun &invalidate_nscd(); 41*4882a593Smuzhiyun 42*4882a593Smuzhiyun create_homedir (1); # copy skeleton data 43*4882a593Smuzhiyun-- 44*4882a593Smuzhiyun1.8.5.2 45*4882a593Smuzhiyun 46