Contents of /smage/trunk/core/mage/alx/files/mage-0.4.10-busybox.patch
Parent Directory
| 
Revision Log
Revision 98 -
(show annotations)
(download)
Sun Jan 25 12:25:46 2009 UTC (15 years, 3 months ago) by niro
File size: 3123 byte(s)
Sun Jan 25 12:25:46 2009 UTC (15 years, 3 months ago) by niro
File size: 3123 byte(s)
-updated alx patches for 0.4.10
| 1 | diff -Naur mage-0.4.9/usr/lib/mage/mgroupadd mage-0.4.9-busybox/usr/lib/mage/mgroupadd |
| 2 | --- mage-0.4.9/usr/lib/mage/mgroupadd 2005-06-01 17:48:38.000000000 +0200 |
| 3 | +++ mage-0.4.9-busybox/usr/lib/mage/mgroupadd 2008-06-19 00:31:36.000000000 +0200 |
| 4 | @@ -39,17 +39,6 @@ |
| 5 | |
| 6 | GROUP_TO_ADD="$1" |
| 7 | |
| 8 | -#start nscd to cache /etc/group |
| 9 | -$(which nscd) -i group |
| 10 | -# get the info |
| 11 | -my_group="$(getent group ${GROUP_TO_ADD})" |
| 12 | - |
| 13 | # if above entries are empty the user/group does not exist |
| 14 | -if [ -z "${my_group}" ] |
| 15 | -then |
| 16 | - echo " Adding group '${GROUP_TO_ADD}' ..." |
| 17 | - groupadd ${GROUP_OPTS} "${GROUP_TO_ADD}" |
| 18 | -else |
| 19 | - echo " Modifing group '${GROUP_TO_ADD}' ..." |
| 20 | - groupmod ${GROUP_OPTS} "${GROUP_TO_ADD}" |
| 21 | -fi |
| 22 | +echo " Adding group '${GROUP_TO_ADD}' ..." |
| 23 | +addgroup ${GROUP_OPTS} "${GROUP_TO_ADD}" |
| 24 | diff -Naur mage-0.4.9/usr/lib/mage/mgroupdel mage-0.4.9-busybox/usr/lib/mage/mgroupdel |
| 25 | --- mage-0.4.9/usr/lib/mage/mgroupdel 2005-06-01 17:48:40.000000000 +0200 |
| 26 | +++ mage-0.4.9-busybox/usr/lib/mage/mgroupdel 2008-06-19 00:31:48.000000000 +0200 |
| 27 | @@ -20,15 +20,5 @@ |
| 28 | |
| 29 | GROUP_TO_DEL="$1" |
| 30 | |
| 31 | -#start nscd to cache /etc/group |
| 32 | -$(which nscd) -i group |
| 33 | -# get the info |
| 34 | -my_user="$(getent group ${GROUP_TO_DEL})" |
| 35 | - |
| 36 | -if [ -z "${my_user}" ] |
| 37 | -then |
| 38 | - echo " User '${GROUP_TO_DEL}' already deleted ..." |
| 39 | -else |
| 40 | - echo " Deleting user '${GROUP_TO_DEL}' ..." |
| 41 | - groupdel "${GROUP_TO_DEL}" |
| 42 | -fi |
| 43 | +echo " Deleting user '${GROUP_TO_DEL}' ..." |
| 44 | +delgroup "${GROUP_TO_DEL}" |
| 45 | diff -Naur mage-0.4.9/usr/lib/mage/museradd mage-0.4.9-busybox/usr/lib/mage/museradd |
| 46 | --- mage-0.4.9/usr/lib/mage/museradd 2005-06-01 17:48:43.000000000 +0200 |
| 47 | +++ mage-0.4.9-busybox/usr/lib/mage/museradd 2008-06-19 01:42:18.000000000 +0200 |
| 48 | @@ -39,16 +39,24 @@ |
| 49 | |
| 50 | USER_TO_ADD="$1" |
| 51 | |
| 52 | -#start nscd to cache passwd |
| 53 | -$(which nscd) -i passwd |
| 54 | -# get the info |
| 55 | -my_user="$(getent passwd ${USER_TO_ADD})" |
| 56 | +fix_user_opts() |
| 57 | +{ |
| 58 | + local i |
| 59 | + local FIXED_USER_OPTS |
| 60 | |
| 61 | -if [ -z "${my_user}" ] |
| 62 | -then |
| 63 | - echo " Adding user '${USER_TO_ADD}' ..." |
| 64 | - useradd ${USER_OPTS} "${USER_TO_ADD}" |
| 65 | -else |
| 66 | - echo " Modifing user '${USER_TO_ADD}' ..." |
| 67 | - usermod ${USER_OPTS} "${USER_TO_ADD}" |
| 68 | -fi |
| 69 | + for i in $* |
| 70 | + do |
| 71 | + case $1 in |
| 72 | + -d) shift; FIXED_USER_OPTS+=" -h $1" ;; |
| 73 | + -g) shift; FIXED_USER_OPTS+=" -G $1" ;; |
| 74 | + -u) shift; [[ $1 -lt 100 ]] && FIXED_USER_OPTS+=" -S" ;; |
| 75 | + *) FIXED_USER_OPTS+=" $1" ;; |
| 76 | + esac |
| 77 | + shift |
| 78 | + done |
| 79 | + |
| 80 | + echo "${FIXED_USER_OPTS}" |
| 81 | +} |
| 82 | + |
| 83 | +echo " Adding user '${USER_TO_ADD}' ..." |
| 84 | +adduser -D $(fix_user_opts ${USER_OPTS}) "${USER_TO_ADD}" |
| 85 | diff -Naur mage-0.4.9/usr/lib/mage/muserdel mage-0.4.9-busybox/usr/lib/mage/muserdel |
| 86 | --- mage-0.4.9/usr/lib/mage/muserdel 2005-06-01 17:48:46.000000000 +0200 |
| 87 | +++ mage-0.4.9-busybox/usr/lib/mage/muserdel 2008-06-19 00:31:00.000000000 +0200 |
| 88 | @@ -20,15 +20,5 @@ |
| 89 | |
| 90 | USER_TO_DEL="$1" |
| 91 | |
| 92 | -#start nscd to cache passwd |
| 93 | -$(which nscd) -i passwd |
| 94 | -# get the info |
| 95 | -my_user="$(getent passwd ${USER_TO_DEL})" |
| 96 | - |
| 97 | -if [ -z "${my_user}" ] |
| 98 | -then |
| 99 | - echo " User '${USER_TO_DEL}' already deleted ..." |
| 100 | -else |
| 101 | - echo " Deleting user '${USER_TO_DEL}' ..." |
| 102 | - userdel "${USER_TO_DEL}" |
| 103 | -fi |
| 104 | +echo " Deleting user '${USER_TO_DEL}' ..." |
| 105 | +deluser "${USER_TO_DEL}" |