Menu
▾
▴
[CVS unattended] dosemu patch, thanks to Steffen Kaiser
|
From: Eugene K. <ek...@us...> - 2007-05-16 14:26:06
|
<html>
<head>
<style><!--
body {background-color:#ffffff;}
.file {border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;}
.pathname {font-family:monospace; float:right;}
.fileheader {margin-bottom:.5em;}
.diff {margin:0;}
.tasklist {padding:4px;border:1px dashed #000000;margin-top:1em;}
.tasklist ul {margin-top:0;margin-bottom:0;}
tr.alt {background-color:#eeeeee}
#added {background-color:#ddffdd;}
#addedchars {background-color:#99ff99;font-weight:bolder;}
tr.alt #added {background-color:#ccf7cc;}
#removed {background-color:#ffdddd;}
#removedchars {background-color:#ff9999;font-weight:bolder;}
tr.alt #removed {background-color:#f7cccc;}
#info {color:#888888;}
#context {background-color:#eeeeee;}
td {padding-left:.3em;padding-right:.3em;}
tr.head {border-bottom-width:1px;border-bottom-style:solid;}
tr.head td {padding:0;padding-top:.2em;}
.task {background-color:#ffff00;}
.comment {white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space:-o-pre-wrap;white-space:pre-wrap;word-wrap:break-word;padding:4px;border:1px dashed #000000;background-color:#ffffdd}
.error {color:red;}
hr {border-width:0px;height:2px;background:black;}
--></style>
</head>
<body>
<table cellspacing="0" cellpadding="0" border="0" rules="cols">
<tr class="head"><td colspan="4">Commit in <b><tt>unattended/install/dosbin</tt></b><span id="info"> on MAIN</span></td></tr>
<tr><td><tt><a href="#file1">install.pl</a></tt></td><td align="right" id="added">+18</td><td align="right" id="removed">-3</td><td nowrap="nowrap" align="center">1.142 -> 1.143</td></tr>
</table>
<pre class="comment">
dosemu patch, thanks to Steffen Kaiser
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname">unattended/install/dosbin</span><br />
<div class="fileheader"><big><b>install.pl</b></big> <small id="info">1.142 -> 1.143</small></div>
<pre class="diff"><small id="info">diff -u -r1.142 -r1.143
--- install.pl 6 Jan 2005 21:24:13 -0000 1.142
+++ install.pl 16 May 2007 14:26:04 -0000 1.143
@@ -403,7 +403,7 @@
</small></pre><pre class="diff" id="context">
my %status_hash = map { $_ => undef } @expected_statuses;
</pre><pre class="diff" id="removed">- my $tmpfile = '\\tmp.txt';
</pre><pre class="diff" id="added">+ my $tmpfile = $u->{'_meta'}->{'tmpdrive'}.'\\tmp.txt';
</pre><pre class="diff" id="context">
my $ret = system "$cmd > $tmpfile < nul";
my $status = $ret >> 8;
</pre><pre class="diff"><small id="info">@@ -1077,6 +1077,11 @@
</small></pre><pre class="diff" id="context"> ("Enter NTP servers, separated by spaces (default=none):");
};
</pre><pre class="diff" id="added">+$u->comments ('_meta', 'tmpdrive') = [ 'Drive used for temporary files in DOS' ];
+(defined $ENV{'TMPDRIVE'})
+ or $ENV{'TMPDRIVE'}='';
+$u->{'_meta'}->{'tmpdrive'} = $ENV{'TMPDRIVE'};
+
</pre><pre class="diff" id="context"> $u->comments ('_meta', 'dos_zdrv') = [ 'Install share drive letter in DOS' ];
(defined $ENV{'DOS_ZDRV'})
or $ENV{'DOS_ZDRV'}='Z:';
</pre><pre class="diff"><small id="info">@@ -1592,8 +1597,18 @@
</small></pre><pre class="diff" id="context">
# Batch script to run after this script exits.
my $doit = "$netinst\\doit.bat";
</pre><pre class="diff" id="removed">-$is_linux
- and push @doit_cmds, 'xcopy /s /e /y Y:\\ C:\\';
</pre><pre class="diff" id="added">+if($is_linux) {
+ # xcopy will copy a file that will prevent a cycling of DOSemu
+ # this is tested as the first command
+ # The filename itself
+ my $noCycling = "$netinst\\" . int(rand(10000000)) . ".tmp";
+ # First of all, if the checkpoint file exist, leave DOSEmu
+ unshift @doit_cmds, "IF EXIST $noCycling EXITEMU";
+ push @doit_cmds, 'xcopy /s /e /y Y:\\ C:\\';
+ # have the XCOPY command copy over the checkpoint file
+ write_file($noCycling, 'prevent cycling of DOSemu');
+}
+
</pre><pre class="diff" id="context"> push @doit_cmds, split /;/, $u->{'_meta'}->{'doit_cmds'};
print "Creating $doit...";
write_file ($doit, @doit_cmds);
</pre></div>
<center><small><a href="http://www.badgers-in-foil.co.uk/projects/cvsspam/" title="commit -> email">CVSspam</a> 0.2.12</small></center>
</body></html>
|