Magellan Linux

  • Back to homepage
    • /[alx-svn]/smage/trunk/core/mage/alx/files/mage-0.4.9-busybox.patch

    Contents of /smage/trunk/core/mage/alx/files/mage-0.4.9-busybox.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 5 - (show annotations) (download)
    Sun Jan 11 00:59:57 2009 UTC (15 years, 5 months ago) by niro
    File size: 7881 byte(s) 
    -moved several base packages to 'core'
    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/mgroupadd~ mage-0.4.9-busybox/usr/lib/mage/mgroupadd~
    25 --- mage-0.4.9/usr/lib/mage/mgroupadd~ 1970-01-01 01:00:00.000000000 +0100
    26 +++ mage-0.4.9-busybox/usr/lib/mage/mgroupadd~ 2005-06-01 17:48:38.000000000 +0200
    27 @@ -0,0 +1,55 @@
    28 +#!/bin/bash
    29 +# $Header: /alx-cvs/smage-eglibc/mage/alx/files/mage-0.4.9-busybox.patch,v 1.3 2008/06/19 12:33:58 niro Exp $
    30 +
    31 +print_usage()
    32 +{
    33 + echo "$(basename $0 .sh) adds groups to /etc/group."
    34 + echo " USAGE: $(basename $0 .sh) -o OPTIONS GROUP_NAME .."
    35 + echo
    36 + echo " OPTIONS: -o \"OPTS\"all options from /usr/sbin/groupadd can be used."
    37 + echo
    38 + echo " Examples:"
    39 + echo " $(basename $0 .sh) -o \"-g 22\" sshd"
    40 + echo
    41 +}
    42 +
    43 +while getopts "o:-" opt ; do
    44 + case "${opt}" in
    45 + o)
    46 + GROUP_OPTS="${OPTARG}"
    47 + ;;
    48 +
    49 + -) break
    50 + ;;
    51 +
    52 + *)
    53 + print_usage
    54 + exit 1
    55 + ;;
    56 + esac
    57 +done
    58 +shift $(($OPTIND - 1))
    59 +
    60 +#exit if $1 is zero
    61 +if [ -z "$1" ]
    62 +then
    63 + print_usage
    64 + exit 1
    65 +fi
    66 +
    67 +GROUP_TO_ADD="$1"
    68 +
    69 +#start nscd to cache /etc/group
    70 +$(which nscd) -i group
    71 +# get the info
    72 +my_group="$(getent group ${GROUP_TO_ADD})"
    73 +
    74 +# if above entries are empty the user/group does not exist
    75 +if [ -z "${my_group}" ]
    76 +then
    77 + echo " Adding group '${GROUP_TO_ADD}' ..."
    78 + groupadd ${GROUP_OPTS} "${GROUP_TO_ADD}"
    79 +else
    80 + echo " Modifing group '${GROUP_TO_ADD}' ..."
    81 + groupmod ${GROUP_OPTS} "${GROUP_TO_ADD}"
    82 +fi
    83 diff -Naur mage-0.4.9/usr/lib/mage/mgroupdel mage-0.4.9-busybox/usr/lib/mage/mgroupdel
    84 --- mage-0.4.9/usr/lib/mage/mgroupdel 2005-06-01 17:48:40.000000000 +0200
    85 +++ mage-0.4.9-busybox/usr/lib/mage/mgroupdel 2008-06-19 00:31:48.000000000 +0200
    86 @@ -20,15 +20,5 @@
    87
    88 GROUP_TO_DEL="$1"
    89
    90 -#start nscd to cache /etc/group
    91 -$(which nscd) -i group
    92 -# get the info
    93 -my_user="$(getent group ${GROUP_TO_DEL})"
    94 -
    95 -if [ -z "${my_user}" ]
    96 -then
    97 - echo " User '${GROUP_TO_DEL}' already deleted ..."
    98 -else
    99 - echo " Deleting user '${GROUP_TO_DEL}' ..."
    100 - groupdel "${GROUP_TO_DEL}"
    101 -fi
    102 +echo " Deleting user '${GROUP_TO_DEL}' ..."
    103 +delgroup "${GROUP_TO_DEL}"
    104 diff -Naur mage-0.4.9/usr/lib/mage/mgroupdel~ mage-0.4.9-busybox/usr/lib/mage/mgroupdel~
    105 --- mage-0.4.9/usr/lib/mage/mgroupdel~ 1970-01-01 01:00:00.000000000 +0100
    106 +++ mage-0.4.9-busybox/usr/lib/mage/mgroupdel~ 2005-06-01 17:48:40.000000000 +0200
    107 @@ -0,0 +1,34 @@
    108 +#!/bin/bash
    109 +# $Header: /alx-cvs/smage-eglibc/mage/alx/files/mage-0.4.9-busybox.patch,v 1.3 2008/06/19 12:33:58 niro Exp $
    110 +
    111 +print_usage()
    112 +{
    113 + echo "$(basename $0 .sh) deletes users from /etc/group."
    114 + echo " USAGE: $(basename $0 .sh) GROUP_NAME .."
    115 + echo
    116 + echo " Examples:"
    117 + echo " $(basename $0 .sh) sshd"
    118 + echo
    119 +}
    120 +
    121 +#exit if $1 is zero
    122 +if [ -z "$1" ]
    123 +then
    124 + print_usage
    125 + exit 1
    126 +fi
    127 +
    128 +GROUP_TO_DEL="$1"
    129 +
    130 +#start nscd to cache /etc/group
    131 +$(which nscd) -i group
    132 +# get the info
    133 +my_user="$(getent group ${GROUP_TO_DEL})"
    134 +
    135 +if [ -z "${my_user}" ]
    136 +then
    137 + echo " User '${GROUP_TO_DEL}' already deleted ..."
    138 +else
    139 + echo " Deleting user '${GROUP_TO_DEL}' ..."
    140 + groupdel "${GROUP_TO_DEL}"
    141 +fi
    142 diff -Naur mage-0.4.9/usr/lib/mage/museradd mage-0.4.9-busybox/usr/lib/mage/museradd
    143 --- mage-0.4.9/usr/lib/mage/museradd 2005-06-01 17:48:43.000000000 +0200
    144 +++ mage-0.4.9-busybox/usr/lib/mage/museradd 2008-06-19 01:42:18.000000000 +0200
    145 @@ -39,16 +39,24 @@
    146
    147 USER_TO_ADD="$1"
    148
    149 -#start nscd to cache passwd
    150 -$(which nscd) -i passwd
    151 -# get the info
    152 -my_user="$(getent passwd ${USER_TO_ADD})"
    153 +fix_user_opts()
    154 +{
    155 + local i
    156 + local FIXED_USER_OPTS
    157
    158 -if [ -z "${my_user}" ]
    159 -then
    160 - echo " Adding user '${USER_TO_ADD}' ..."
    161 - useradd ${USER_OPTS} "${USER_TO_ADD}"
    162 -else
    163 - echo " Modifing user '${USER_TO_ADD}' ..."
    164 - usermod ${USER_OPTS} "${USER_TO_ADD}"
    165 -fi
    166 + for i in $*
    167 + do
    168 + case $1 in
    169 + -d) shift; FIXED_USER_OPTS+=" -h $1" ;;
    170 + -g) shift; FIXED_USER_OPTS+=" -G $1" ;;
    171 + -u) shift; [[ $1 -lt 100 ]] && FIXED_USER_OPTS+=" -S" ;;
    172 + *) FIXED_USER_OPTS+=" $1" ;;
    173 + esac
    174 + shift
    175 + done
    176 +
    177 + echo "${FIXED_USER_OPTS}"
    178 +}
    179 +
    180 +echo " Adding user '${USER_TO_ADD}' ..."
    181 +adduser -D $(fix_user_opts ${USER_OPTS}) "${USER_TO_ADD}"
    182 diff -Naur mage-0.4.9/usr/lib/mage/museradd~ mage-0.4.9-busybox/usr/lib/mage/museradd~
    183 --- mage-0.4.9/usr/lib/mage/museradd~ 1970-01-01 01:00:00.000000000 +0100
    184 +++ mage-0.4.9-busybox/usr/lib/mage/museradd~ 2008-06-19 00:30:39.000000000 +0200
    185 @@ -0,0 +1,60 @@
    186 +#!/bin/bash
    187 +# $Header: /alx-cvs/smage-eglibc/mage/alx/files/mage-0.4.9-busybox.patch,v 1.3 2008/06/19 12:33:58 niro Exp $
    188 +
    189 +print_usage()
    190 +{
    191 + echo "$(basename $0 .sh) adds users to /etc/passwd."
    192 + echo " USAGE: $(basename $0 .sh) -o OPTIONS USER_NAME .."
    193 + echo
    194 + echo " OPTIONS: -o \"OPTS\"all options from /usr/sbin/useradd can be used."
    195 + echo
    196 + echo " Examples:"
    197 + echo " $(basename $0 .sh) -o \"-u 22 -g sshd -d /var/empty -s /bin/false\" sshd"
    198 + echo
    199 +}
    200 +
    201 +while getopts "o:-" opt ; do
    202 + case "${opt}" in
    203 + o)
    204 + USER_OPTS="${OPTARG}"
    205 + ;;
    206 +
    207 + -) break
    208 + ;;
    209 +
    210 + *)
    211 + print_usage
    212 + exit 1
    213 + ;;
    214 + esac
    215 +done
    216 +shift $(($OPTIND - 1))
    217 +
    218 +#exit if $1 is zero
    219 +if [ -z "$1" ]
    220 +then
    221 + print_usage
    222 + exit 1
    223 +fi
    224 +
    225 +USER_TO_ADD="$1"
    226 +
    227 +fix_user_opts()
    228 +{
    229 + local i
    230 + local FIXED_USER_OPTS
    231 +
    232 + for i in $*
    233 + do
    234 + case $1 in
    235 + -d) shift ;; # ignore this one
    236 + -g) shift; FIXED_USER_OPTS+=" -G $1" ;;
    237 + -u) shift; [[ $1 -lt 100 ]] && FIXED_USER_OPTS+=" -S" ;;
    238 + *) FIXED_USER_OPTS+=" $1" ;;
    239 + esac
    240 + shift
    241 + done
    242 +}
    243 +
    244 +echo " Adding user '${USER_TO_ADD}' ..."
    245 +adduser -D ${USER_OPTS} "$(fix_user_opts ${USER_TO_ADD})"
    246 diff -Naur mage-0.4.9/usr/lib/mage/muserdel mage-0.4.9-busybox/usr/lib/mage/muserdel
    247 --- mage-0.4.9/usr/lib/mage/muserdel 2005-06-01 17:48:46.000000000 +0200
    248 +++ mage-0.4.9-busybox/usr/lib/mage/muserdel 2008-06-19 00:31:00.000000000 +0200
    249 @@ -20,15 +20,5 @@
    250
    251 USER_TO_DEL="$1"
    252
    253 -#start nscd to cache passwd
    254 -$(which nscd) -i passwd
    255 -# get the info
    256 -my_user="$(getent passwd ${USER_TO_DEL})"
    257 -
    258 -if [ -z "${my_user}" ]
    259 -then
    260 - echo " User '${USER_TO_DEL}' already deleted ..."
    261 -else
    262 - echo " Deleting user '${USER_TO_DEL}' ..."
    263 - userdel "${USER_TO_DEL}"
    264 -fi
    265 +echo " Deleting user '${USER_TO_DEL}' ..."
    266 +deluser "${USER_TO_DEL}"
    267 diff -Naur mage-0.4.9/usr/lib/mage/muserdel~ mage-0.4.9-busybox/usr/lib/mage/muserdel~
    268 --- mage-0.4.9/usr/lib/mage/muserdel~ 1970-01-01 01:00:00.000000000 +0100
    269 +++ mage-0.4.9-busybox/usr/lib/mage/muserdel~ 2005-06-01 17:48:46.000000000 +0200
    270 @@ -0,0 +1,34 @@
    271 +#!/bin/bash
    272 +# $Header: /alx-cvs/smage-eglibc/mage/alx/files/mage-0.4.9-busybox.patch,v 1.3 2008/06/19 12:33:58 niro Exp $
    273 +
    274 +print_usage()
    275 +{
    276 + echo "$(basename $0 .sh) deletes users from /etc/passwd."
    277 + echo " USAGE: $(basename $0 .sh) USER_NAME .."
    278 + echo
    279 + echo " Examples:"
    280 + echo " $(basename $0 .sh) sshd"
    281 + echo
    282 +}
    283 +
    284 +#exit if $1 is zero
    285 +if [ -z "$1" ]
    286 +then
    287 + print_usage
    288 + exit 1
    289 +fi
    290 +
    291 +USER_TO_DEL="$1"
    292 +
    293 +#start nscd to cache passwd
    294 +$(which nscd) -i passwd
    295 +# get the info
    296 +my_user="$(getent passwd ${USER_TO_DEL})"
    297 +
    298 +if [ -z "${my_user}" ]
    299 +then
    300 + echo " User '${USER_TO_DEL}' already deleted ..."
    301 +else
    302 + echo " Deleting user '${USER_TO_DEL}' ..."
    303 + userdel "${USER_TO_DEL}"
    304 +fi