From ecbc26168df5386c8cb983a5fc79826cf0f66808 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 16 Feb 2011 08:42:10 +0100 Subject: [PATCH] initramfs-tools: make the test for NOEXEC depend on /etc/mtab again, to avoid a warning. --- srcpkgs/initramfs-tools/files/mkinitramfs | 8 +++++--- srcpkgs/initramfs-tools/template | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/srcpkgs/initramfs-tools/files/mkinitramfs b/srcpkgs/initramfs-tools/files/mkinitramfs index 7f76c5d44fb..a01ff76eef1 100755 --- a/srcpkgs/initramfs-tools/files/mkinitramfs +++ b/srcpkgs/initramfs-tools/files/mkinitramfs @@ -166,9 +166,11 @@ chmod 755 "${DESTDIR}" # do not execute cache_run_scripts() if mounted with noexec NOEXEC="" -fs=$(df -P $DESTDIR | tail -1 | awk '{print $6}') -if [ -n "$fs" ] && mount | grep -q "on $fs .*noexec" ; then - NOEXEC=1 +if [ -r /etc/mtab ]; then + fs=$(df -P $DESTDIR | tail -1 | awk '{print $6}') + if [ -n "$fs" ] && mount | grep -q "on $fs .*noexec" ; then + NOEXEC=1 + fi fi __TMPCPIOGZ="$(mktemp ${TMPDIR:-/tmp}/mkinitramfs-OL_XXXXXX)" || exit 1 diff --git a/srcpkgs/initramfs-tools/template b/srcpkgs/initramfs-tools/template index ca3a7689eb5..3575c114f84 100644 --- a/srcpkgs/initramfs-tools/template +++ b/srcpkgs/initramfs-tools/template @@ -1,6 +1,6 @@ # Template file for 'initramfs-tools' pkgname=initramfs-tools -_localver=0.99.8.1 # This is the XBPS version +_localver=0.99.8.2 # This is the XBPS version _distver=0.98.8 # This should match debian version version=${_localver}.${_distver} build_style=custom-install