From 754abdb16633a3531c4de6774661333c265293dd Mon Sep 17 00:00:00 2001
From: Jay Larson <jlarson@snaplinux.org>
Date: Tue, 16 May 2017 19:54:01 -0500
Subject: [PATCH] Added useradd default file and usher to manage it

---
 Makefile             |  4 ++++
 SNAP/useradd.default | 22 ++++++++++++++++++++++
 SNAP/usher           |  6 +++++-
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 SNAP/useradd.default

diff --git a/Makefile b/Makefile
index d0a0ef1..f6c7786 100644
--- a/Makefile
+++ b/Makefile
@@ -66,6 +66,10 @@ $(ROOT): $(SRCDIR)/src/vipw
 	@cd $(SRCDIR) && make install DESTDIR=$(ROOT) && \
 	mv $(ROOT)/usr/bin/passwd $(ROOT)/bin/passwd
 
+	@install -v -d -m 755 $(ROOT)/usr/share/shadow && \
+	install -v -m 644 $(PWD)/SNAP/useradd.default \
+		$(ROOT)/usr/share/shadow/useradd.default
+
 clean:
 	@rm -rvf $(ROOT) \
 		$(SNAPINFO) \
diff --git a/SNAP/useradd.default b/SNAP/useradd.default
new file mode 100644
index 0000000..890ff19
--- /dev/null
+++ b/SNAP/useradd.default
@@ -0,0 +1,22 @@
+# Default configuration for the useradd utility
+
+# The default user shell
+SHELL=/bin/bash
+
+# The default GID If the -n option is used
+#GROUP=100
+
+# Default user home directory
+#HOME=/home
+
+# Number of days until account deactivation for expired password
+#INACTIVE=-1
+
+# The date on which the user account is disabled
+#EXPIRE=
+
+# Skeleton directory used to populate a new user's home directory
+#SKEL=/etc/skel
+
+# Create mail spool file during new account creation
+#CREATE_MAIL_SPOOL=yes
diff --git a/SNAP/usher b/SNAP/usher
index e14875f..ed38e80 100755
--- a/SNAP/usher
+++ b/SNAP/usher
@@ -24,10 +24,14 @@ case $1 in
       fi
 
       if [ ! -f /etc/gshadow ]; then
-        echo "Converting /etc/group to gshadow for ${TARGET}"
+        echo "Converting /etc/group to gshadow"
         grpconv
       fi
     fi
+
+    if [ ! -f ${TARGET}/etc/default/useradd ]; then
+      cp ${TARGET}/usr/share/shadow/useradd.default /etc/default/useradd
+    fi
     ;;
   prerm)
     exit 0