diff options
| author | Jonathan Bauer | 2013-03-14 15:04:04 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2013-03-14 15:04:04 +0100 |
| commit | af1e97fe43dba1b41e9b1f212e45e128bd268caf (patch) | |
| tree | ceb57c836e973e58df576efa750b9bb32fa5e23e | |
| parent | RIP INIT_DIR (diff) | |
| download | tm-scripts-af1e97fe43dba1b41e9b1f212e45e128bd268caf.tar.gz tm-scripts-af1e97fe43dba1b41e9b1f212e45e128bd268caf.tar.xz tm-scripts-af1e97fe43dba1b41e9b1f212e45e128bd268caf.zip | |
fix INIT_DIR to TARGET_BUILD_DIR
| -rw-r--r-- | helper/useradd.inc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/helper/useradd.inc b/helper/useradd.inc index bcbb25b2..3f54a24a 100644 --- a/helper/useradd.inc +++ b/helper/useradd.inc @@ -58,7 +58,7 @@ generate_gid() } add_user() { - [ -z "${INIT_DIR}" ] && perror "add_user: INIT_DIR not set" + [ -z "${TARGET_BUILD_DIR}" ] && perror "add_user: TARGET_BUILD_DIR not set" if [ -z $USER -a $# -eq 0 ] then pwarning " ** add_user usage **" @@ -67,9 +67,9 @@ add_user() { pwarning "USER=<username> [GROUP=<groupname>] [USERID=<userid>] [GROUPID=<groupid>] [USERHOME=<homedir>] [USERSHELL=<shell>] [PASSWORD=<pass>] add_user" perror "Aborting, please fix your script." fi - local _PASSWD=${INIT_DIR}/etc/passwd - local _GROUP=${INIT_DIR}/etc/group - local _SHADOW=${INIT_DIR}/etc/shadow + local _PASSWD=${TARGET_BUILD_DIR}/etc/passwd + local _GROUP=${TARGET_BUILD_DIR}/etc/group + local _SHADOW=${TARGET_BUILD_DIR}/etc/shadow init_users_and_groups [ ! -f "${_PASSWD}" ] && perror "add_user: password file does not exist in target system. (build base first)" [ ! -f "${_GROUP}" ] && perror "add_user: group file does not exist in target system. (build base first)" @@ -154,10 +154,10 @@ add_user() { add_group () { [ $# -lt 1 ] && perror "add_group called without argument." - [ -z "${INIT_DIR}" ] && perror "add_group: INIT_DIR not set" - local _PASSWD=${INIT_DIR}/etc/passwd - local _GROUP=${INIT_DIR}/etc/group - local _SHADOW=${INIT_DIR}/etc/shadow + [ -z "${TARGET_BUILD_DIR}" ] && perror "add_group: TARGET_BUILD_DIR not set" + local _PASSWD=${TARGET_BUILD_DIR}/etc/passwd + local _GROUP=${TARGET_BUILD_DIR}/etc/group + local _SHADOW=${TARGET_BUILD_DIR}/etc/shadow init_users_and_groups [ ! -f "${_GROUP}" ] && perror "add_user: group file does not exist in target system. (build base first)" local GROUP=$1 @@ -183,10 +183,10 @@ add_group () { } init_users_and_groups() { - [ -z "${INIT_DIR}" ] && perror "Almost wrecked your local passwd, group and shadow file. phew." - local PASSWD=${INIT_DIR}/etc/passwd - local GROUP=${INIT_DIR}/etc/group - local SHADOW=${INIT_DIR}/etc/shadow + [ -z "${TARGET_BUILD_DIR}" ] && perror "Almost wrecked your local passwd, group and shadow file. phew." + local PASSWD=${TARGET_BUILD_DIR}/etc/passwd + local GROUP=${TARGET_BUILD_DIR}/etc/group + local SHADOW=${TARGET_BUILD_DIR}/etc/shadow [ -s "${PASSWD}" -a -s "${GROUP}" -a -s "${SHADOW}" ] && return pinfo "Creating users and groups based on local system...." cp "/etc/passwd" "$PASSWD" |