diff options
| author | Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> | 2011-06-23 22:00:54 -0300 |
|---|---|---|
| committer | Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> | 2011-07-09 15:14:49 -0300 |
| commit | 93763a2d8225a92ef99e73478ac118919872ab27 (patch) | |
| tree | d1464f4ab902194fe93212eb0dc20c457bc7a150 | |
| parent | 0d895a225a30a86733bcfbd600fc6e5880b11977 (diff) | |
| download | archiso32-93763a2d8225a92ef99e73478ac118919872ab27.tar.xz | |
[archiso] Delete etc/mtab on _cleanup step
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
| -rwxr-xr-x | archiso/mkarchiso | 4 | ||||
| -rwxr-xr-x | configs/releng/build.sh | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/archiso/mkarchiso b/archiso/mkarchiso index 673f570..12d8936 100755 --- a/archiso/mkarchiso +++ b/archiso/mkarchiso @@ -191,6 +191,10 @@ _cleanup () { if [[ -d "${work_dir}/root-image/tmp" ]]; then find "${work_dir}/root-image/tmp" -mindepth 1 -delete fi + # Delete etc/mtab if not is a symlink. + if [[ ! -L "${work_dir}/root-image/etc/mtab" ]]; then + rm -f "${work_dir}/root-image/etc/mtab" + fi } # Makes a SquashFS filesystem image of file/directory passes as argument with desired compression. diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 1aa80fd..be906c2 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -34,9 +34,6 @@ make_customize_root_image() { cp -af root-image ${work_dir} chmod 750 ${work_dir}/root-image/etc/sudoers.d chmod 440 ${work_dir}/root-image/etc/sudoers.d/g_wheel - if [[ ! -L ${work_dir}/root-image/etc/mtab ]]; then - rm -f ${work_dir}/root-image/etc/mtab - fi mkdir -p ${work_dir}/root-image/etc/pacman.d wget -O ${work_dir}/root-image/etc/pacman.d/mirrorlist http://www.archlinux.org/mirrorlist/all/ sed -i "s/#Server/Server/g" ${work_dir}/root-image/etc/pacman.d/mirrorlist |