Ignore:
Timestamp:
Jan 8, 2012 2:55:10 PM (8 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
7feaadb
Parents:
43ec87e (diff), 59bd51a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

propagate from branch 'i2p.i2p' (head b7ee04ecc7a594239e977b25a52ebdabadce558e)

to branch 'i2p.i2p.zzz.jetty6' (head 2cd4a4dae8b87b9ed2128d83aff1b39e3a818556)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • debian/i2p.postinst

    r43ec87e r69bbb88  
    6262        mv -f /etc/i2p/wrapper.config.tmp /etc/i2p/wrapper.config
    6363
    64     migrate_existing_user(){
    65         # Adjust the user/group in /etc/passwd, mainly for upgrades from old packages that didn't
    66         # create $I2PSYSUSER as a system group/user
    67         usermod -c "I2P Router Daemon" -m -d $I2PHOME -g $I2PSYSUSER -s "/bin/false" \
    68             -l $I2PSYSUSER -e 1 > /dev/null 2>&1
    69         echo "Existing user migrated, home directory moved to $I2PHOME"
    70     }
    71 
    7264    # Create user and group as a system user.
    73     adduser --system --quiet --group --home $I2PHOME $I2PSYSUSER || migrate_existing_user
     65    if getent passwd i2psvc > /dev/null 2>&1 ; then
     66        groupadd -f $I2PSYSUSER || true
     67        usermod -c "I2P Router Daemon" -d $I2PHOME -g $I2PSYSUSER -s "/bin/false" \
     68            $I2PSYSUSER -e 1 > /dev/null 2>&1 || true
     69    else
     70        adduser --system --quiet --group --home $I2PHOME $I2PSYSUSER
     71    fi
    7472
    7573    [ -d /var/log/i2p ] || mkdir -m0750 /var/log/i2p
    76     chown -f -R $I2PSYSUSER:adm /var/log/i2p
     74    chown -f -R $I2PSYSUSER:i2psvc /var/log/i2p
    7775
    7876    # Has someone set the permissions with dpkg-statoverride? If so, obey them.
     
    9492                ;;
    9593esac
    96    
     94
    9795#DEBHELPER#
    9896
Note: See TracChangeset for help on using the changeset viewer.