From 931c03fae14c6d80996c3176b26ad9b6239932a4 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 6 May 2009 07:54:56 +0200 Subject: [PATCH] xbps-base-files: more fixes for the initramfs-tools trigger. Test /proc/filesystems and /sys/kernel/vmcoreinfo to know if /proc and /sys are mounted, as the former was required for mountinfo. This finally works while installing a package with and without rootdir. Bump revision. --HG-- extra : convert_revision : df009b5088c47931d7ae82af2c4f7dad9af5337f --- templates/xbps-base-files/template | 2 +- triggers/initramfs-tools | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/templates/xbps-base-files/template b/templates/xbps-base-files/template index dcafdb3ff3d..2bcf57a9c0e 100644 --- a/templates/xbps-base-files/template +++ b/templates/xbps-base-files/template @@ -1,6 +1,6 @@ # Template file for 'xbps-base-files' pkgname=xbps-base-files -version=0.15 +version=0.16 build_style=custom-install short_desc="xbps base system files" maintainer="Juan RP " diff --git a/triggers/initramfs-tools b/triggers/initramfs-tools index 055444c4997..b865fff1041 100755 --- a/triggers/initramfs-tools +++ b/triggers/initramfs-tools @@ -32,11 +32,12 @@ run) initramfs_cmd="$initramfs_cmd -u -k $4" fi - if ! /lib/rc/bin/mountinfo -q /proc; then + if [ ! -e /proc/filesystems ]; then mount -t proc proc /proc proc_mounted=1 fi - if ! /lib/rc/bin/mountinfo -q /sys; then + + if [ ! -e /sys/kernel/vmcoreinfo ]; then mount -t sysfs sysfs /sys sys_mounted=1 fi