Refactor

Author: xdissent

control/activate.xml

@@ -122,10 +122,8 @@ copy_scripts() {
   cp "/vagrant/control/deuac.reg" "${initrd}/scripts/"
   cp "/vagrant/control/reuac.reg" "${initrd}/scripts/"
   cp "/vagrant/control/vboxga.bat" "${initrd}/scripts/"
-  cp "/vagrant/control/activate.xml" "${initrd}/scripts/"
-  cp "/vagrant/control/rearm.xml" "${initrd}/scripts/"
-  cp "/vagrant/control/boot.xml" "${initrd}/scripts/"
-  cp "/vagrant/control/boot.bat" "${initrd}/scripts/"
+  cp "/vagrant/control/ievms.xml" "${initrd}/scripts/"
+  cp "/vagrant/control/ievms.bat" "${initrd}/scripts/"
   cp "/vagrant/control/isolinux.cfg" "${remaster_iso}/isolinux.cfg"
   cp "/vagrant/control/isolinux.cfg" "${remaster_iso}/syslinux.cfg"
   cp "${kernel}" "${remaster_iso}/"

control/boot.bat

@@ -0,0 +1 @@
+if exist C:\Users\IEUser\ievms.bat C:\Users\IEUser\ievms.bat

control/build.sh

@@ -4,11 +4,7 @@
     <Date>2013-06-20T12:19:16.22375</Date>
     <Author>IE9Win7\IEUser</Author>
   </RegistrationInfo>
-  <Triggers>
-    <BootTrigger>
-      <Enabled>true</Enabled>
-    </BootTrigger>
-  </Triggers>
+  <Triggers />
   <Principals>
     <Principal id="Author">
       <UserId>IE9Win7\IEUser</UserId>
@@ -37,7 +33,7 @@
   </Settings>
   <Actions Context="Author">
     <Exec>
-      <Command>C:\boot.bat</Command>
+      <Command>C:\ievms.bat</Command>
     </Exec>
   </Actions>
 </Task>

control/ievms.bat

@@ -26,10 +26,8 @@ else
   fi
 
   cp /scripts/reuac.reg /disk/reuac.reg
-  cp /scripts/activate.xml /disk/activate.xml
-  cp /scripts/rearm.xml /disk/rearm.xml
-  cp /scripts/boot.xml /disk/boot.xml
-  cp /scripts/boot.bat /disk/boot.bat
+  cp /scripts/ievms.xml /disk/ievms.xml
+  cp /scripts/ievms.bat /disk/ievms.bat
 fi
 umount /disk 2>/dev/null
 poweroff

control/boot.xml control/ievms.xml

@@ -6,10 +6,10 @@ VBoxWindowsAdditions.exe /S
 regedit.exe /S C:\reuac.reg
 del C:\reuac.reg
 FOR /F "usebackq" %%i IN (`hostname`) DO SET HOST=%%i
-schtasks.exe /create /s %HOST% /ru %HOST%\IEUser /rp Passw0rd! /tn activate /xml C:\activate.xml
-schtasks.exe /create /s %HOST% /ru %HOST%\IEUser /rp Passw0rd! /tn rearm /xml C:\rearm.xml
-schtasks.exe /create /s %HOST% /ru %HOST%\IEUser /rp Passw0rd! /tn boot /xml C:\boot.xml
-schtasks.exe /run /tn activate
+schtasks.exe /create /s %HOST% /ru %HOST%\IEUser /rp Passw0rd! /tn ievms /xml C:\ievms.xml
+echo slmgr.vbs /ato >C:\Users\IEUser\ievms.bat
+schtasks.exe /run /tn ievms
 timeout /t 30
+del C:\Users\IEUser\ievms.bat
 shutdown.exe /s /t 00
 del %0