diff options
Diffstat (limited to 'ci/data/install-root.sh')
| -rwxr-xr-x | ci/data/install-root.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ci/data/install-root.sh b/ci/data/install-root.sh index 1aacb79..68e0d8a 100755 --- a/ci/data/install-root.sh +++ b/ci/data/install-root.sh @@ -12,18 +12,18 @@ aptitude -y install -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--f rsync -av /data/ / -if (( OLO_UID != 0 )); then +if (( USER_UID != 0 )); then userdel ubuntu || true groupdel ubuntu || true rm -rf /home/ubuntu || true - export HOMEDIR="/home/${OLO_USERNAME}" - groupadd -g "${OLO_GID}" "${OLO_GROUPNAME}" || OLO_GROUPNAME=$(grep -F "x:${OLO_GID}:" /etc/group | awk -F: '{print $1}') - useradd -s /bin/bash -m -u "${OLO_UID}" -g "${OLO_GROUPNAME}" "${OLO_USERNAME}" || OLO_USERNAME=$(grep -F "x:${OLO_UID}:" /etc/passwd | awk -F: '{print $1}') - SUDOERS_FILENAME="${OLO_USERNAME//\./_}" - echo "${OLO_USERNAME} ALL=(ALL) NOPASSWD: ALL" > "/etc/sudoers.d/${SUDOERS_FILENAME}" + export HOMEDIR="/home/${USER_USERNAME}" + groupadd -g "${USER_GID}" "${USER_GROUPNAME}" || USER_GROUPNAME=$(grep -F "x:${USER_GID}:" /etc/group | awk -F: '{print $1}') + useradd -s /bin/bash -m -u "${USER_UID}" -g "${USER_GROUPNAME}" "${USER_USERNAME}" || USER_USERNAME=$(grep -F "x:${USER_UID}:" /etc/passwd | awk -F: '{print $1}') + SUDOERS_FILENAME="${USER_USERNAME//\./_}" + echo "${USER_USERNAME} ALL=(ALL) NOPASSWD: ALL" > "/etc/sudoers.d/${SUDOERS_FILENAME}" chmod 0440 "/etc/sudoers.d/${SUDOERS_FILENAME}" mkdir -p "${HOMEDIR}/.gnupg" - chown "${OLO_USERNAME}":"${OLO_GROUPNAME}" "${HOMEDIR}/.gnupg" + chown "${USER_USERNAME}":"${USER_GROUPNAME}" "${HOMEDIR}/.gnupg" chmod 0700 "${HOMEDIR}/.gnupg" fi |