Menu
▾
▴
[CVS unattended] Support for windows XP 64. Thanks to Admin at internode.com.au
|
From: Juan J. P. <jj...@us...> - 2008-04-10 22:09:46
|
<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</tt></b><span id="info"> on MAIN</span></td></tr>
<tr><td><tt>install/lib/Unattend/<a href="#file1">WinMedia.pm</a></tt></td><td align="right" id="added">+35</td><td align="right" id="removed">-8</td><td nowrap="nowrap" align="center">1.28 -> 1.29</td></tr>
<tr class="alt"><td><tt>linuxboot/misc/<a href="#file2">nt5x-install</a></tt></td><td align="right" id="added">+3</td><td align="right" id="removed">-3</td><td nowrap="nowrap" align="center">1.2 -> 1.3</td></tr>
<tr><td></td><td align="right" id="added">+38</td><td align="right" id="removed">-11</td><td></td></tr>
</table>
<small id="info">2 modified files</small><br />
<pre class="comment">
Support for windows XP 64. Thanks to Admin at internode.com.au
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname">unattended/install/lib/Unattend</span><br />
<div class="fileheader"><big><b>WinMedia.pm</b></big> <small id="info">1.28 -> 1.29</small></div>
<pre class="diff"><small id="info">diff -u -r1.28 -r1.29
--- WinMedia.pm 14 Oct 2004 07:21:06 -0000 1.28
+++ WinMedia.pm 10 Apr 2008 22:09:39 -0000 1.29
@@ -30,9 +30,20 @@
</small></pre><pre class="diff" id="context">
my Unattend::WinMedia $self = fields::new ($class);
</pre><pre class="diff" id="removed">- my $txtsetup = $file_spec->catfile ($path, 'i386', 'txtsetup.sif');
- my $setupp = $file_spec->catfile ($path, 'i386', 'setupp.ini');
- my $prodspec = $file_spec->catfile ($path, 'i386', 'prodspec.ini');
</pre><pre class="diff" id="added">+ my $txtsetup;
+ my $setupp;
+ my $prodspec;
+
+ if (-d &$dos_to_host ($file_spec->catfile( $path, 'amd64'))) {
+ $txtsetup = $file_spec->catfile ($path, 'amd64', 'txtsetup.sif');
+ $setupp = $file_spec->catfile ($path, 'amd64', 'setupp.ini');
+ $prodspec = $file_spec->catfile ($path, 'amd64', 'prodspec.ini');
+ }
+ else {
+ $txtsetup = $file_spec->catfile ($path, 'i386', 'txtsetup.sif');
+ $setupp = $file_spec->catfile ($path, 'i386', 'setupp.ini');
+ $prodspec = $file_spec->catfile ($path, 'i386', 'prodspec.ini');
+ }
</pre><pre class="diff" id="context"> -f &$dos_to_host ($txtsetup) && -f &$dos_to_host($setupp)
&& -f &$dos_to_host ($prodspec)
or return undef;
</pre><pre class="diff"><small id="info">@@ -135,6 +146,8 @@
</small></pre><pre class="diff" id="context">
my %pid_table =
(
</pre><pre class="diff" id="added">+ # Windows Server 2003, Standard x64 Edition
+ '76869270' => 'Volume',
</pre><pre class="diff" id="context"> # Windows Server 2003
'69763000' => 'Trial',
'69753000' => 'Retail',
</pre><pre class="diff"><small id="info">@@ -277,8 +290,13 @@
</small></pre><pre class="diff" id="context"> my $verbose = shift;
my $oem_system_dir = shift;
</pre><pre class="diff" id="removed">- defined $oem_system_dir
- or $oem_system_dir = $file_spec->catdir ($self->path (), 'i386', '$oem$', '$1');
</pre><pre class="diff" id="added">+ if (not defined $oem_system_dir) {
+ if (-d &$dos_to_host ($file_spec->catfile($self->path (), 'amd64'))) {
+ $oem_system_dir = $file_spec->catdir ($self->path (), 'amd64', '$oem$', '$1');
+ } else {
+ $oem_system_dir = $file_spec->catdir ($self->path (), 'i386', '$oem$', '$1');
+ }
+ }
</pre><pre class="diff" id="context">
$verbose
and print "Looking for drivers under $oem_system_dir...\n";
</pre><pre class="diff"><small id="info">@@ -296,7 +314,11 @@
</small></pre><pre class="diff" id="context"> sub _textmode_dir ($) {
my Unattend::WinMedia ($self) = @_;
</pre><pre class="diff" id="removed">- return $file_spec->catdir ($self->path, 'i386', '$oem$','textmode');
</pre><pre class="diff" id="added">+ if (-d &$dos_to_host ($file_spec->catfile( $self->path (), 'amd64'))) {
+ return $file_spec->catdir ($self->path, 'amd64', '$oem$','textmode');
+ } else {
+ return $file_spec->catdir ($self->path, 'i386', '$oem$','textmode');
+ }
</pre><pre class="diff" id="context"> }
# Return the names of drivers from the [scsi] section of txtsetup.oem.
</pre><pre class="diff"><small id="info">@@ -387,7 +409,7 @@
</small></pre><pre class="diff" id="context"> return @ret;
}
</pre><pre class="diff" id="removed">-# Return the subdirectories of i386 which exist and hold language
</pre><pre class="diff" id="added">+# Return the subdirectories of i386 <span id="addedchars">or amd64 </span>which exist and hold language
</pre><pre class="diff" id="context"> # files.
sub lang_dirs ($;$) {
my Unattend::WinMedia ($self) = shift;
</pre><pre class="diff"><small id="info">@@ -395,7 +417,12 @@
</small></pre><pre class="diff" id="context"> my @ret;
my $dir = 'lang';
</pre><pre class="diff" id="removed">- my $full_path = $file_spec->catdir ($self->path (), 'i386', $dir);
</pre><pre class="diff" id="added">+ my $full_path;
+ if (-d &$dos_to_host ($file_spec->catfile( $self->path (), 'amd64'))) {
+ $full_path = $file_spec->catdir ($self->path (), 'amd64', $dir);
+ } else {
+ $full_path = $file_spec->catdir ($self->path (), 'i386', $dir);
+ }
</pre><pre class="diff" id="context"> $verbose
and print "Looking for $full_path...\n";
</pre></div>
<hr /><a name="file2" /><div class="file">
<span class="pathname">unattended/linuxboot/misc</span><br />
<div class="fileheader"><big><b>nt5x-install</b></big> <small id="info">1.2 -> 1.3</small></div>
<pre class="diff"><small id="info">diff -u -r1.2 -r1.3
--- nt5x-install 8 Apr 2008 22:42:48 -0000 1.2
+++ nt5x-install 10 Apr 2008 22:09:39 -0000 1.3
@@ -173,8 +173,8 @@
</small></pre><pre class="diff" id="context"> then
copy_files "$OS_DIR/i386/" "/c/\$win_nt\$.~ls/" 1 "Copy i386 system"
fi
</pre><pre class="diff" id="removed">-copy_files "/c/\$win_nt\$.~ls/i386/" "/c/\$win_nt\$.~bt/" 2 "Copy installation files."
-copy_files "/c/\$win_nt\$.~ls/i386/system32/" "/c/\$win_nt\$.~bt/system32/" 2 "Copy system32."
</pre><pre class="diff" id="added">+copy_files "/c/\$win_nt\$.~ls/$ARCH/" "/c/\$win_nt\$.~bt/" 2 "Copy $ARCH installation files."
+copy_files "/c/\$win_nt\$.~ls/$ARCH/system32/" "/c/\$win_nt\$.~bt/system32/" 2 "Copy $ARCH system32."
</pre><pre class="diff" id="context"> copy_files "$OS_DIR/i386/ntldr" "/c/" 3 "Copy ntldr."
copy_files "$OS_DIR/i386/ntdetect.com" "/c/" 3 "Copy ntdetect.com."
copy_files "$OS_DIR/i386/setupldr.bin" "/c/\$ldr\$" 3 "Copy setupldr.bin."
</pre><pre class="diff"><small id="info">@@ -189,7 +189,7 @@
</small></pre><pre class="diff" id="context"> copy_files "/c/netinst/unattend.txt" "/c/\$win_nt\$.~bt/winnt.sif" 3 "Copy winnt.sif."
#move files/drivers to the right place.....
</pre><pre class="diff" id="removed">-message "Move driver direcory"
</pre><pre class="diff" id="added">+message "Move driver direc<span id="addedchars">t</span>ory"
</pre><pre class="diff" id="context"> mv /c/\$win_nt\$.~ls/$ARCH/\$[Oo][eE][mM]\$/* /c/\$/
message "Syncing disk -aiaparanoia :-)"
</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>
|