Magellan Linux

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

    Diff of /smage/trunk/core/mage/alx/files/mage-0.4.16-busybox.patch

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 1243 by niro, Tue Aug 4 20:05:03 2009 UTC revision 1244 by niro, Thu Aug 6 16:54:52 2009 UTC
    # Line 1  Line 1 
    1  diff -Naur mage-0.4.15/usr/lib/mage/mgroupadd mage-0.4.15-alx/usr/lib/mage/mgroupadd  diff -Naur mage-0.4.16/usr/lib/mage/mgroupadd mage-0.4.16-alx/usr/lib/mage/mgroupadd
    2  --- mage-0.4.15/usr/lib/mage/mgroupadd 2009-06-30 22:58:16.000000000 +0200  --- mage-0.4.16/usr/lib/mage/mgroupadd 2009-08-04 22:40:35.000000000 +0200
    3  +++ mage-0.4.15-alx/usr/lib/mage/mgroupadd 2009-08-02 20:36:44.000000000 +0200  +++ mage-0.4.16-alx/usr/lib/mage/mgroupadd 2009-08-06 18:50:35.000000000 +0200
    4  @@ -39,17 +39,6 @@  @@ -39,17 +39,6 @@
    5    
    6   GROUP_TO_ADD="$1"   GROUP_TO_ADD="$1"
    # Line 21  diff -Naur mage-0.4.15/usr/lib/mage/mgro Line 21  diff -Naur mage-0.4.15/usr/lib/mage/mgro
    21  -fi  -fi
    22  +echo "     Adding group '${GROUP_TO_ADD}' ..."  +echo "     Adding group '${GROUP_TO_ADD}' ..."
    23  +addgroup ${GROUP_OPTS} "${GROUP_TO_ADD}"  +addgroup ${GROUP_OPTS} "${GROUP_TO_ADD}"
    24  diff -Naur mage-0.4.15/usr/lib/mage/mgroupdel mage-0.4.15-alx/usr/lib/mage/mgroupdel  diff -Naur mage-0.4.16/usr/lib/mage/mgroupdel mage-0.4.16-alx/usr/lib/mage/mgroupdel
    25  --- mage-0.4.15/usr/lib/mage/mgroupdel 2009-06-30 22:58:16.000000000 +0200  --- mage-0.4.16/usr/lib/mage/mgroupdel 2009-08-04 22:40:35.000000000 +0200
    26  +++ mage-0.4.15-alx/usr/lib/mage/mgroupdel 2009-08-02 20:37:10.000000000 +0200  +++ mage-0.4.16-alx/usr/lib/mage/mgroupdel 2009-08-06 18:50:35.000000000 +0200
    27  @@ -20,15 +20,5 @@  @@ -20,15 +20,5 @@
    28    
    29   GROUP_TO_DEL="$1"   GROUP_TO_DEL="$1"
    # Line 42  diff -Naur mage-0.4.15/usr/lib/mage/mgro Line 42  diff -Naur mage-0.4.15/usr/lib/mage/mgro
    42  -fi  -fi
    43  +echo "     Deleting user '${GROUP_TO_DEL}' ..."  +echo "     Deleting user '${GROUP_TO_DEL}' ..."
    44  +delgroup "${GROUP_TO_DEL}"  +delgroup "${GROUP_TO_DEL}"
    45  diff -Naur mage-0.4.15/usr/lib/mage/museradd mage-0.4.15-alx/usr/lib/mage/museradd  diff -Naur mage-0.4.16/usr/lib/mage/museradd mage-0.4.16-alx/usr/lib/mage/museradd
    46  --- mage-0.4.15/usr/lib/mage/museradd 2009-06-30 22:58:16.000000000 +0200  --- mage-0.4.16/usr/lib/mage/museradd 2009-08-04 22:40:35.000000000 +0200
    47  +++ mage-0.4.15-alx/usr/lib/mage/museradd 2009-08-02 20:38:13.000000000 +0200  +++ mage-0.4.16-alx/usr/lib/mage/museradd 2009-08-06 18:52:46.000000000 +0200
    48  @@ -39,16 +39,24 @@  @@ -39,16 +39,46 @@
    49    
    50   USER_TO_ADD="$1"   USER_TO_ADD="$1"
    51    
    # Line 53  diff -Naur mage-0.4.15/usr/lib/mage/muse Line 53  diff -Naur mage-0.4.15/usr/lib/mage/muse
    53  -$(which nscd) -i passwd  -$(which nscd) -i passwd
    54  -# get the info  -# get the info
    55  -my_user="$(getent passwd ${USER_TO_ADD})"  -my_user="$(getent passwd ${USER_TO_ADD})"
    56  +fix_user_opts()  -
     +{  
     + local i  
     + local FIXED_USER_OPTS  
       
    57  -if [ -z "${my_user}" ]  -if [ -z "${my_user}" ]
    58  -then  -then
    59  - echo "     Adding user '${USER_TO_ADD}' ..."  - echo "     Adding user '${USER_TO_ADD}' ..."
    # Line 66  diff -Naur mage-0.4.15/usr/lib/mage/muse Line 62  diff -Naur mage-0.4.15/usr/lib/mage/muse
    62  - echo "     Modifing user '${USER_TO_ADD}' ..."  - echo "     Modifing user '${USER_TO_ADD}' ..."
    63  - usermod ${USER_OPTS} "${USER_TO_ADD}"  - usermod ${USER_OPTS} "${USER_TO_ADD}"
    64  -fi  -fi
    65    +fix_user_opts()
    66    +{
    67    + local i
    68    + local FIXED_USER_OPTS
    69    +
    70  + for i in $*  + for i in $*
    71  + do  + do
    72  + case $1 in  + case $1 in
    73  + -d) shift; FIXED_USER_OPTS+=" -h $1" ;;  + -d) shift; FIXED_USER_OPTS+=" -h $1" ;;
    74  + -g) shift; FIXED_USER_OPTS+=" -G $1" ;;  + -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" ;;  + -u) shift; [[ $1 -lt 100 ]] && FIXED_USER_OPTS+=" -S" ;;
    77  + *) FIXED_USER_OPTS+=" $1" ;;  + *) FIXED_USER_OPTS+=" $1" ;;
    78  + esac  + esac
    # Line 80  diff -Naur mage-0.4.15/usr/lib/mage/muse Line 82  diff -Naur mage-0.4.15/usr/lib/mage/muse
    82  + echo "${FIXED_USER_OPTS}"  + 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}' ..."  +echo "     Adding user '${USER_TO_ADD}' ..."
    103  +adduser -D $(fix_user_opts ${USER_OPTS}) "${USER_TO_ADD}"  +adduser -D $(fix_user_opts ${USER_OPTS}) "${USER_TO_ADD}"
    104  diff -Naur mage-0.4.15/usr/lib/mage/muserdel mage-0.4.15-alx/usr/lib/mage/muserdel  +for grp in $(fix_group_opts ${USER_OPTS})
    105  --- mage-0.4.15/usr/lib/mage/muserdel 2009-06-30 22:58:16.000000000 +0200  +do
    106  +++ mage-0.4.15-alx/usr/lib/mage/muserdel 2009-08-02 20:38:34.000000000 +0200  + 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 @@  @@ -20,15 +20,5 @@
    112    
    113   USER_TO_DEL="$1"   USER_TO_DEL="$1"
    Legend:
    Removed from v.1243  
    changed lines
      Added in v.1244