From 9be93ceba7a4de58d5a788d1700c23320e162224 Mon Sep 17 00:00:00 2001 From: Mike Hibler Date: Fri, 30 Mar 2012 08:45:28 -0600 Subject: [PATCH] Fix heuristic for finding root disk so it works on Fedora 15. Fedora 15 "df" shows two lines for "/" mount; we ignore the "rootfs" line. --- clientside/tmcc/linux/mkextrafs.pl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/clientside/tmcc/linux/mkextrafs.pl b/clientside/tmcc/linux/mkextrafs.pl index 881f1b5fa..69184b7b2 100755 --- a/clientside/tmcc/linux/mkextrafs.pl +++ b/clientside/tmcc/linux/mkextrafs.pl @@ -110,9 +110,10 @@ if (!$lvm || ($lvm && $lmonster)) { } # -# XXX determine the disk based on the root fs +# XXX determine the disk based on the root fs. +# Note: 'rootfs' grep is because Fedora 15 df shows two lines for "/" # -my $rootdev = `df | egrep '/\$'`; +my $rootdev = `df | egrep '/\$' | grep -v rootfs`; if ($rootdev =~ /^\/dev\/([a-z]+)\d+\s+/) { $disk = $1; } -- GitLab