On Wed, Jan 23, 2008 at 12:49:51PM -0500, Matt Hyclak enlightened us:
> I have a patch floating around that I forgot to put into production and then
> wondered why I couldn't reinstall my tablet PCs. I thought I'd send it out
> here to the list for possible inclusion in the next release. It basically
> just looks for the cmpnents directory on the source media, and if it exists
> calls winnt.exe with the correct arguments.
> 

Not to follow up to myself, but I figured a working patch would be better
than what I sent previously. Stupid $'s.

This version is actually tested, is a pretty minimal change, and I'd like to
see it make it into the CVS tree.

Thanks,
Matt

-- 
Matt Hyclak
Department of Mathematics 
Department of Social Work
Ohio University
(740) 593-1263
Index: install/dosbin/install.pl
===================================================================
RCS file: /cvsroot/unattended/unattended/install/dosbin/install.pl,v
retrieving revision 1.149
diff -u -r1.149 install.pl
--- install/dosbin/install.pl   8 Jan 2008 08:33:00 -0000       1.149
+++ install/dosbin/install.pl   25 Jan 2008 14:31:59 -0000
@@ -976,9 +976,29 @@
         validate_old_dos_dir ($src_tree);
         $src_tree =~ /\\$/
             or $src_tree .= '\\';
-        $src_tree .= 'i386';
         my $dos_zdrv = $u->{'_meta'}->{'dos_zdrv'};
-        return "$dos_zdrv;cd $src_tree;winnt $lang_opts /s:$src_tree 
/u:$unattend_txt";
+        my $cmpnents = "";
+        my $winnt_path = "";
+        my $winnt_opts = "";
+
+        if ($is_linux) {
+            (my $linux_tree = $src_tree) =~ s#\\#/#g;
+            $linux_tree =~ s#$dos_zdrv#/z#g;
+
+            $cmpnents = $linux_tree . "cmpnents";
+        } else {
+            $cmpnents = $src_tree . "cmpnents";
+        }
+        print "$cmpnents\n";
+
+        if ( -e $cmpnents ) {
+            $winnt_path = "i386\\winnt";
+            $winnt_opts = "/2";
+        } else {
+            $src_tree .= 'i386';
+        }
+
+        return "$dos_zdrv;cd $src_tree;$winnt_path $winnt_opts $lang_opts 
/s:$src_tree /u:$unattend_txt";
     };
 
 $u->comments ('_meta', 'edit_files') =
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
unattended-devel mailing list
unattended-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/unattended-devel

Reply via email to