Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/mage/patches/mage-0.4.19-busybox.patch

    Contents of /trunk/mage/patches/mage-0.4.19-busybox.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 975 - (show annotations) (download)
    Thu Jan 7 16:51:41 2010 UTC (14 years, 3 months ago) by niro
    File size: 3491 byte(s) 
    -mcore patches
    1 diff -Naur mage-0.4.16/usr/lib/mage/mgroupadd mage-0.4.16-alx/usr/lib/mage/mgroupadd
    2 --- mage-0.4.16/usr/lib/mage/mgroupadd 2009-08-04 22:40:35.000000000 +0200
    3 +++ mage-0.4.16-alx/usr/lib/mage/mgroupadd 2009-08-06 18:50:35.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.16/usr/lib/mage/mgroupdel mage-0.4.16-alx/usr/lib/mage/mgroupdel
    25 --- mage-0.4.16/usr/lib/mage/mgroupdel 2009-08-04 22:40:35.000000000 +0200
    26 +++ mage-0.4.16-alx/usr/lib/mage/mgroupdel 2009-08-06 18:50:35.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.16/usr/lib/mage/museradd mage-0.4.16-alx/usr/lib/mage/museradd
    46 --- mage-0.4.16/usr/lib/mage/museradd 2009-08-04 22:40:35.000000000 +0200
    47 +++ mage-0.4.16-alx/usr/lib/mage/museradd 2009-08-06 18:52:46.000000000 +0200
    48 @@ -39,16 +39,46 @@
    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 -
    57 -if [ -z "${my_user}" ]
    58 -then
    59 - echo " Adding user '${USER_TO_ADD}' ..."
    60 - useradd ${USER_OPTS} "${USER_TO_ADD}"
    61 -else
    62 - echo " Modifing user '${USER_TO_ADD}' ..."
    63 - usermod ${USER_OPTS} "${USER_TO_ADD}"
    64 -fi
    65 +fix_user_opts()
    66 +{
    67 + local i
    68 + local FIXED_USER_OPTS
    69 +
    70 + for i in $*
    71 + do
    72 + case $1 in
    73 + -d) shift; FIXED_USER_OPTS+=" -h $1" ;;
    74 + -g) shift; FIXED_USER_OPTS+=" -G $1" ;;
    75 + -G) shift; shift; continue;; # will be parsed through fix_group_opts
    76 + -u) shift; [[ $1 -lt 100 ]] && FIXED_USER_OPTS+=" -S" ;;
    77 + *) FIXED_USER_OPTS+=" $1" ;;
    78 + esac
    79 + shift
    80 + done
    81 +
    82 + echo "${FIXED_USER_OPTS}"
    83 +}
    84 +
    85 +fix_group_opts()
    86 +{
    87 + local i
    88 + local FIXED_GROUP_OPTS
    89 +
    90 + for i in $*
    91 + do
    92 + case $1 in
    93 + -G) shift; FIXED_GROUP_OPTS+="$(echo $1 | sed 's:,:\ :g')" ;;
    94 + esac
    95 + shift
    96 + done
    97 +
    98 + echo "${FIXED_GROUP_OPTS}"
    99 +}
    100 +
    101 +
    102 +echo " Adding user '${USER_TO_ADD}' ..."
    103 +adduser -D $(fix_user_opts ${USER_OPTS}) "${USER_TO_ADD}"
    104 +for grp in $(fix_group_opts ${USER_OPTS})
    105 +do
    106 + addgroup "${USER_TO_ADD}" "${grp}"
    107 +done
    108 diff -Naur mage-0.4.16/usr/lib/mage/muserdel mage-0.4.16-alx/usr/lib/mage/muserdel
    109 --- mage-0.4.16/usr/lib/mage/muserdel 2009-08-04 22:40:35.000000000 +0200
    110 +++ mage-0.4.16-alx/usr/lib/mage/muserdel 2009-08-06 18:50:35.000000000 +0200
    111 @@ -20,15 +20,5 @@
    112
    113 USER_TO_DEL="$1"
    114
    115 -#start nscd to cache passwd
    116 -$(which nscd) -i passwd
    117 -# get the info
    118 -my_user="$(getent passwd ${USER_TO_DEL})"
    119 -
    120 -if [ -z "${my_user}" ]
    121 -then
    122 - echo " User '${USER_TO_DEL}' already deleted ..."
    123 -else
    124 - echo " Deleting user '${USER_TO_DEL}' ..."
    125 - userdel "${USER_TO_DEL}"
    126 -fi
    127 +echo " Deleting user '${USER_TO_DEL}' ..."
    128 +deluser "${USER_TO_DEL}"