From: Bruce S. <bl...@us...> - 2005-04-29 14:48:48
|
Update of /cvsroot/devil-linux/build/scripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18980/scripts/scripts Modified Files: Tag: rel-1-2-patches upgrade-config Log Message: upgrade-config now migrates more passwd/group info Index: upgrade-config =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/scripts/upgrade-config,v retrieving revision 1.22.2.2 retrieving revision 1.22.2.3 diff -u -d -r1.22.2.2 -r1.22.2.3 --- upgrade-config 20 Feb 2005 03:36:07 -0000 1.22.2.2 +++ upgrade-config 29 Apr 2005 14:48:38 -0000 1.22.2.3 @@ -254,21 +254,10 @@ if askyesno "User and Group migration" "Do you want to migrate your old users, groups and passwords?" yes ; then migrateid () { - cp -f newconfig/${1} newconfig/${1}- - cp -f newconfig/${2} newconfig/${2}- - > newconfig/${2} - - # Migrate passwords for existing users/groups - while read id ; do - name="$(echo $id|cut -d: -f1)" - if [ $(grep -c "^${name}:" ${2}) -ne 1 ]; then - grep "^${name}:" newconfig/${2}- >> newconfig/${2} - else - grep "^${name}:" ${2} >> newconfig/${2} - fi - [ "$(grep "^${name}:" ${2})" != "$(grep "^${name}:" newconfig/${2}-)" ] && \ - echo ${name} - info migrated. | tee -a $LOGF - done < newconfig/$1 + cp -f ${1} newconfig/${1} + cp -f ${2} newconfig/${2} + cp -f ${1} newconfig/${1}- + cp -f ${2} newconfig/${2}- # Add all non-existing users/groups to new config while read id ; do |