Skip to content

Commit

Permalink
fix data dir perms: root dir must belong to root user
Browse files Browse the repository at this point in the history
  • Loading branch information
olevole committed May 14, 2019
1 parent 4c45ec8 commit 7026ad2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
13 changes: 7 additions & 6 deletions freebsd_world.subr
Expand Up @@ -52,17 +52,15 @@ populate_freebsd_world()

/usr/bin/touch "${data}/etc/fstab"

[ ! -d ${data}/usr/home ] && mkdir ${data}/usr/home
[ ! -d ${data}/usr/local ] && mkdir ${data}/usr/local
[ ! -d ${data}/compat ] && mkdir ${data}/compat
[ ! -d ${data}/usr/ports ] && mkdir ${data}/usr/ports
[ ! -d ${data}/usr/local/etc ] && mkdir -p ${data}/usr/local/etc
for i in ${data}/usr/home ${data}/usr/local ${data}/compat ${data}/usr/ports ${data}/usr/local/etc; do
[ ! -d ${i} ] && /bin/mkdir -p ${i}
done

if [ ${applytpl} -eq 1 ]; then
/usr/bin/touch ${data}/etc/src.conf
if [ -d "${jailskeldir}" ]; then
${ECHO} "${N1_COLOR}Applying skel dir template from: ${N2_COLOR}${jailskeldir}${N0_COLOR}"
cd ${jailskeldir} && /usr/bin/find -E ${jailskeldir} \( -type f -or -type d -or -type l \) -print |/usr/bin/sed s:${jailskeldir}:./:g |/usr/bin/cpio -pdmu ${data} > /dev/null 2>&1
cd ${jailskeldir} && /usr/bin/find -E ${jailskeldir} \( -type f -or -type d -or -type l \) -print | /usr/bin/sed s:${jailskeldir}:./:g | /usr/bin/cpio -pdmu ${data} > /dev/null 2>&1
else
${ECHO} "${N1_COLOR}Skel dir template not found: ${N2_COLOR}${jailskeldir}${N0_COLOR}"
fi
Expand All @@ -73,6 +71,9 @@ populate_freebsd_world()

[ ! -f "${data}/etc/localtime" -a -f /etc/localtime ] && /bin/cp -a /etc/localtime ${data}/etc
fi

# always set root:wheel
/usr/sbin/chown root:wheel ${data}
}


Expand Down
1 change: 1 addition & 0 deletions jailctl/jcreate
Expand Up @@ -250,6 +250,7 @@ fi
## MD backend

create_fs ${data}

[ $? -ne 0 ] && err 1 "${N1_COLOR}create_fs failed${N0_COLOR}"
[ ! -d "${data}" ] && err 1 "Can't create datadir ${data}"

Expand Down

0 comments on commit 7026ad2

Please sign in to comment.