diff -Naur mage-0.4.22/usr/lib/mage/mgroupadd mage-0.4.22-mcore/usr/lib/mage/mgroupadd --- mage-0.4.22/usr/lib/mage/mgroupadd 2010-12-27 17:15:05.000000000 +0100 +++ mage-0.4.22-mcore/usr/lib/mage/mgroupadd 2010-12-27 17:18:32.000000000 +0100 @@ -39,7 +39,25 @@ GROUP_TO_ADD="$1" +fix_group_opts() +{ + local i + local FIXED_GROUP_OPTS + + for i in $* + do + case $1 in + -s) FIXED_GROUP_OPTS+=" -S" ;; + *) FIXED_GROUP_OPTS+=" $1" ;; + esac + shift + done + + echo "${FIXED_GROUP_OPTS}" +} + + # if above entries are empty the user/group does not exist echo " Adding group '${GROUP_TO_ADD}' ..." -addgroup ${GROUP_OPTS} "${GROUP_TO_ADD}" +addgroup $(fix_group_opts ${GROUP_OPTS}) "${GROUP_TO_ADD}" diff -Naur mage-0.4.22/usr/lib/mage/museradd mage-0.4.22-mcore/usr/lib/mage/museradd --- mage-0.4.22/usr/lib/mage/museradd 2010-12-27 17:15:05.000000000 +0100 +++ mage-0.4.22-mcore/usr/lib/mage/museradd 2010-12-27 17:15:51.000000000 +0100 @@ -51,6 +51,7 @@ -g) shift; FIXED_USER_OPTS+=" -G $1" ;; -G) shift; shift; continue;; # will be parsed through fix_group_opts -u) shift; [[ $1 -lt 100 ]] && FIXED_USER_OPTS+=" -S" ;; + -s) FIXED_USER_OPTS+=" -S" ;; *) FIXED_USER_OPTS+=" $1" ;; esac shift