main/shadow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed user configurable files from files.tar.gz - now managed by usher

Browse Source
This commit is contained in:
Jay Larson
2017-05-31 09:42:02 -05:00
parent 20f3b112f6
commit 4ce0021784
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@@ -15,7 +15,7 @@ BRIEF = Shadow password utilities
DESC = This package includes the programs necessary to convert traditional \ DESC = This package includes the programs necessary to convert traditional \
V7 UNIX password files to the SVR4 shadow password format and additional \ V7 UNIX password files to the SVR4 shadow password format and additional \
tools to work with shadow passwords. tools to work with shadow passwords.
SNAPVER = 7 SNAPVER = 8
ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1) ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1)
TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n') TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n')
@@ -68,7 +68,11 @@ $(ROOT): $(SRCDIR)/src/vipw
@install -v -d -m 755 $(ROOT)/usr/share/shadow && \ @install -v -d -m 755 $(ROOT)/usr/share/shadow && \
install -v -m 644 $(PWD)/SNAP/useradd.default \ install -v -m 644 $(PWD)/SNAP/useradd.default \
$(ROOT)/usr/share/shadow/useradd.default $(ROOT)/usr/share/shadow/useradd.default && \
rm -v $(ROOT)/etc/default/useradd && \
mv -v $(ROOT)/etc/{login.{defs,access},limits} \
$(ROOT)/usr/share/shadow && \
rmdir $(ROOT)/etc/default $(ROOT)/etc
clean: clean:
@rm -rvf $(ROOT) \ @rm -rvf $(ROOT) \

13
SNAP/usher
View File

@@ -29,8 +29,19 @@ case $1 in
fi fi
fi fi
if [ ! -f ${TARGET}/etc/login.defs ]; then
cp ${TARGET}/usr/share/shadow/login.defs ${TARGET}/etc/default/login.defs
fi
if [ ! -f ${TARGET}/etc/login.access ]; then
cp ${TARGET}/usr/share/shadow/login.access \
${TARGET}/etc/default/login.access
fi
if [ ! -f ${TARGET}/etc/limits ]; then
cp ${TARGET}/usr/share/shadow/limits ${TARGET}/etc/limits
fi
if [ ! -f ${TARGET}/etc/default/useradd ]; then if [ ! -f ${TARGET}/etc/default/useradd ]; then
cp ${TARGET}/usr/share/shadow/useradd.default /etc/default/useradd cp ${TARGET}/usr/share/shadow/useradd.default \
${TARGET}/etc/default/useradd
fi fi
;; ;;
prerm) prerm)