From 58eaf5f7eee3708fa3f9afadcef49107d6ff715d Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Sun, 7 Sep 2008 03:27:58 +0000 Subject: [PATCH] -Have copycds prefer udf when image has both iso9660 and udf (like MS media seems to) git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@2090 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/copycds.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/copycds.pm b/xCAT-server/lib/xcat/plugins/copycds.pm index f83e0b909..2782bd33d 100644 --- a/xCAT-server/lib/xcat/plugins/copycds.pm +++ b/xCAT-server/lib/xcat/plugins/copycds.pm @@ -74,11 +74,11 @@ sub process_request { } else { $file = $_; } - my $mntopts; + my $mntopts = "-t udf,iso9660"; #Prefer udf formate to iso when media supports both, like MS media if (-r $file and -b $file) # Block device? - { $mntopts = "-o ro"; } + { $mntopts .= " -o ro"; } elsif (-r $file and -f $file) # Assume ISO file - { $mntopts = "-o ro,loop"; } + { $mntopts .= " -o ro,loop"; } else { $callback->({error=>"The management server was unable to find/read $file. Ensure that file exists on the server at the specified location."}); return;