jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

initramfs-tools: make the test for NOEXEC depend on /etc/mtab again, to avoid a warning.

Browse source
This commit is contained in:
Juan RP 2011-02-16 08:42:10 +01:00
parent 232822b609
commit ecbc26168d
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
srcpkgs/initramfs-tools/files/mkinitramfs
View file

@ -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

2
srcpkgs/initramfs-tools/template
View file

@ -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