wok-current diff slitaz-base-files/receipt @ rev 23944
Up tazinst (107)
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Fri Sep 18 15:48:56 2020 +0000 (2020-09-18) |
parents | a8546de77bcc |
children | a17c0b257e47 |
line diff
1.1 --- a/slitaz-base-files/receipt Sat Aug 01 16:19:51 2020 +0000 1.2 +++ b/slitaz-base-files/receipt Fri Sep 18 15:48:56 2020 +0000 1.3 @@ -108,7 +108,9 @@ 1.4 # 1.5 pre_install() 1.6 { 1.7 - # cp -a "$1/etc" "$1/tmp/etc.bak" 2>/dev/null 1.8 + for i in passwd shadow group gshadow ; do 1.9 + [ -s /etc/$i ] && cp /etc/$i /etc/$i.orig 1.10 + done 1.11 [ -x "$1/usr/bin/sudo" ] && mv "$1/usr/bin/sudo" "$1/usr/bin/sudo.orig" 1.12 # Remove old /var/run symlink 1.13 [ -h "$1/var/run" ] && rm -f "$1/var/run" 1.14 @@ -117,9 +119,13 @@ 1.15 1.16 post_install() 1.17 { 1.18 - # if cp -a "$1/tmp/etc.bak"/* "$1/etc"; then 1.19 - # rm -r "$1/tmp/etc.bak" 1.20 - # fi 2>/dev/null 1.21 + for i in passwd shadow group gshadow ; do 1.22 + [ -s $1/etc/$i.orig ] || continue 1.23 + while read line; do 1.24 + grep -q "^${line%%:*}:" $1/etc/$i.orig || echo "$line" >> $1/etc/$i.orig 1.25 + done < $1/etc/$i 1.26 + mv -f $1/etc/$i.orig $1/etc/$i 1.27 + done 1.28 1.29 [ -x "$1/usr/bin/sudo.orig" ] && mv -f "$1/usr/bin/sudo.orig" "$1/usr/bin/sudo" 1.30