ruben/ezjail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make deletes less verbose. also rename tmpfile to ezjail_tmpfile

Browse Source
This commit is contained in:
erdgeist 2008-06-04 01:02:54 +00:00
parent 5315494529
commit 68704c8cc9
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ezjail-admin
View File

@ -593,7 +593,7 @@ delete)
rm -f "${ezjail_config}" "/etc/fstab.${ezjail_safename}" rm -f "${ezjail_config}" "/etc/fstab.${ezjail_safename}"
# if there is a soft link pointing to the jail root, remove it # if there is a soft link pointing to the jail root, remove it
[ -L "${ezjail_softlink}" ] && rm "${ezjail_softlink}" [ -L "${ezjail_softlink}" ] && rm -f "${ezjail_softlink}"
# if wiping the jail was requested, remove it # if wiping the jail was requested, remove it
if [ "${ezjail_wipeme}" ]; then if [ "${ezjail_wipeme}" ]; then
@ -952,11 +952,11 @@ restore)
[ "${ezjail_hscpu}" != "${ezjail_nameprop_hscpu}" ] && exerr "Error: Archive was created on a different CPU. Can not restore. Consider using \"ezjail-admin create -a\" when migrating ezjails." [ "${ezjail_hscpu}" != "${ezjail_nameprop_hscpu}" ] && exerr "Error: Archive was created on a different CPU. Can not restore. Consider using \"ezjail-admin create -a\" when migrating ezjails."
# Save config to tempfile and source it # Save config to tempfile and source it
tmpfile=`mktemp /tmp/ezjail.prop.XXXXXXXX` ezjail_tmpfile=`mktemp /tmp/ezjail.prop.XXXXXXXX`
[ $? -ne 0 ] && exerr "Error: Can't create temporary file." [ $? -ne 0 ] && exerr "Error: Can't create temporary file."
pax -rzn -s:${ezjail_nameprop}:${tmpfile}: -f ${ezjail_fromarchive} ${ezjail_nameprop} pax -rzn -s:${ezjail_nameprop}:${ezjail_tmpfile}: -f ${ezjail_fromarchive} ${ezjail_nameprop}
. "${tmpfile}" . "${ezjail_tmpfile}"
rm -f "${tmpfile}" rm -f "${ezjail_tmpfile}"
shift 1 shift 1
done done
@ -1046,7 +1046,7 @@ config)
# adjust softlink # adjust softlink
if [ -L "${ezjail_softlink}" ]; then if [ -L "${ezjail_softlink}" ]; then
rm "${ezjail_softlink}" rm -f "${ezjail_softlink}"
ln -s "${ezjail_new_rootdir}" "${ezjail_new_softlink}" ln -s "${ezjail_new_rootdir}" "${ezjail_new_softlink}"
fi fi
@ -1058,7 +1058,7 @@ config)
[ "${ezjail_new_imagetype}" ] && \ [ "${ezjail_new_imagetype}" ] && \
echo ${ezjail_new_rootdir}.device ${ezjail_new_rootdir} ufs rw 0 0 >> "/etc/fstab.${ezjail_new_safename}" echo ${ezjail_new_rootdir}.device ${ezjail_new_rootdir} ufs rw 0 0 >> "/etc/fstab.${ezjail_new_safename}"
echo ${ezjail_jailbase} ${ezjail_new_rootdir}/basejail nullfs ro 0 0 >> "/etc/fstab.${ezjail_new_safename}" echo ${ezjail_jailbase} ${ezjail_new_rootdir}/basejail nullfs ro 0 0 >> "/etc/fstab.${ezjail_new_safename}"
rm "/etc/fstab.${ezjail_safename}" rm -f "/etc/fstab.${ezjail_safename}"
# rename config file, preserve comments # rename config file, preserve comments
( (
@ -1081,7 +1081,7 @@ config)
) > "${ezjail_new_config}" ) > "${ezjail_new_config}"
# remove old config # remove old config
rm "${ezjail_config}" rm -f "${ezjail_config}"
# usually that doesnt go smoothly, but the user wanted it # usually that doesnt go smoothly, but the user wanted it
# that way ;) # that way ;)