On Fri, Apr 04, 2008 at 02:47:52PM -0400, Matt Hyclak enlightened us: > I re-created my patch for installing XP Tablet version against current CVS. > It's commented, hopefully it makes sense. It isn't too much of a change, but > if dosemu is still going to be a part of the 4.8 release, I'd like to see > this make it in. >
Resend. I missed one line when porting the patch to the new install.pl. Matt -- Matt Hyclak Department of Mathematics Department of Social Work Ohio University (740) 593-1263
Index: install.pl
===================================================================
RCS file: /cvsroot/unattended/unattended/install/dosbin/install.pl,v
retrieving revision 1.152
diff -u -r1.152 install.pl
--- install.pl 4 Apr 2008 10:46:58 -0000 1.152
+++ install.pl 4 Apr 2008 19:32:31 -0000
@@ -979,9 +979,32 @@
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 = "winnt";
+ my $winnt_opts = "";
+
+ # Create the correct string for the cmpnents directory. This will
+ # either be Z:\os... or /z/os... depending on the boot disk.
+ 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";
+ }
+
+ # Test to see if the cmpnents directory exists - if so we have
+ # XP Tablet and need to call the installer with different arguments.
+ 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') =
pgpnMpukmD5j0.pgp
Description: PGP signature
------------------------------------------------------------------------- Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________ unattended-devel mailing list unattended-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/unattended-devel
