Author: cfinck
Date: Wed Mar 10 19:17:50 2010
New Revision: 46066
URL: http://svn.reactos.org/svn/reactos?rev=46066&view=rev
Log:
Combine the Step1/Step2 creation of the Hybrid-CD. Extra stuff can be added to the directory "hybridcd_extras" now.
Added:
branches/ros-branch-0_3_11-clt2010/reactos/make_hybridcd.cmd
- copied, changed from r46059, branches/ros-branch-0_3_11-clt2010/reactos/hybridcd_step1.cmd
Removed:
branches/ros-branch-0_3_11-clt2010/reactos/hybridcd_step1.cmd
branches/ros-branch-0_3_11-clt2010/reactos/hybridcd_step2.cmd
Removed: branches/ros-branch-0_3_11-clt2010/reactos/hybridcd_step1.cmd
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react…
==============================================================================
--- branches/ros-branch-0_3_11-clt2010/reactos/hybridcd_step1.cmd [iso-8859-1] (original)
+++ branches/ros-branch-0_3_11-clt2010/reactos/hybridcd_step1.cmd (removed)
@@ -1,38 +1,0 @@
-:: Script to create a Hybrid-CD (Boot-CD + Live-CD) for demo purposes.
-:: Only run it from the root "reactos" dir (where you would also call "make").
-::
-:: Written by Colin Finck (2010-03-10)
-::
-:: STEP 1 - Prepare the basic files for the CD
-::
-
-@echo off
-
-:: Ensure that the user already built Boot-CDs and Live-CDs
-if exist "output-i386\bootcd\." (
- if exist "output-i386\livecd\." (
- goto NEXT
- )
-)
-
-echo Please build regular Boot-CDs and Live-CDs first!
-goto :EOF
-
-:: Create directories and copy our stuff there
-:NEXT
-rd /s /q "hybridcd"
-mkdir "hybridcd"
-mkdir "hybridcd\live"
-mkdir "hybridcd\Profiles"
-
-xcopy /e "output-i386\bootcd" "hybridcd"
-xcopy /e "output-i386\livecd\reactos" "hybridcd\live"
-xcopy /e "output-i386\livecd\Profiles" "hybridcd\Profiles"
-
-:: Copy our modified "freeldr.ini"
-copy /y "hybridcd_freeldr.ini" "hybridcd\freeldr.ini"
-
-
-echo The basic stuff has been prepared in the directory "hybridcd".
-echo Now add everything else you want into this directory and run
-echo "hybridcd_step2" afterwards to create the ISO.
Removed: branches/ros-branch-0_3_11-clt2010/reactos/hybridcd_step2.cmd
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react…
==============================================================================
--- branches/ros-branch-0_3_11-clt2010/reactos/hybridcd_step2.cmd [iso-8859-1] (original)
+++ branches/ros-branch-0_3_11-clt2010/reactos/hybridcd_step2.cmd (removed)
@@ -1,25 +1,0 @@
-:: Script to create a Hybrid-CD (Boot-CD + Live-CD) for demo purposes.
-:: Only run it from the root "reactos" dir (where you would also call "make").
-::
-:: Written by Colin Finck (2010-03-10)
-::
-:: STEP 2 - Create the ISO
-::
-
-@echo off
-
-:: Ensure that "mkisofs" exists
-if exist "mkisofs.exe" (
- goto NEXT
-)
-
-echo mkisofs.exe was not found in the current directory.
-echo Please get a correct version for it. (e.g. from "PE Builder" at http://nu2.nu)
-echo.
-echo Our cdmake doesn't support creating an ISO9660:1999 filesystem, which is
-echo important for a universally usable disc.
-goto :EOF
-
-:: Use it
-:NEXT
-mkisofs -iso-level 4 -volid "ReactOS-HybridCD" -b "loader/isoboot.bin" -no-emul-boot -boot-load-size 4 -hide "boot.catalog" -o "hybridcd.iso" "hybridcd"
Copied: branches/ros-branch-0_3_11-clt2010/reactos/make_hybridcd.cmd (from r46059, branches/ros-branch-0_3_11-clt2010/reactos/hybridcd_step1.cmd)
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react…
==============================================================================
--- branches/ros-branch-0_3_11-clt2010/reactos/hybridcd_step1.cmd [iso-8859-1] (original)
+++ branches/ros-branch-0_3_11-clt2010/reactos/make_hybridcd.cmd [iso-8859-1] Wed Mar 10 19:17:50 2010
@@ -3,22 +3,34 @@
::
:: Written by Colin Finck (2010-03-10)
::
-:: STEP 1 - Prepare the basic files for the CD
-::
@echo off
-:: Ensure that the user already built Boot-CDs and Live-CDs
+:: Ensure that
+:: - the user already built Boot-CDs and Live-CDs
+:: - put his extra stuff into "hybridcd_extras"
+:: - added a copy of mkisofs
if exist "output-i386\bootcd\." (
if exist "output-i386\livecd\." (
- goto NEXT
+ if exist "hybridcd_extras\." (
+ if exist "mkisofs.exe" (
+ goto NEXT
+ )
+ )
)
)
echo Please build regular Boot-CDs and Live-CDs first!
+echo Also create a directory "hybridcd_extras" and put everything else
+echo for the CD root into this directory.
+echo.
+echo You also need to put a version of "mkisofs.exe" into this
+echo directory. Get one from e.g. "PE Builder" at http://nu2.nu/.
+echo Our cdmake doesn't support creating an ISO9660:1999 filesystem, which is
+echo important for a universally usable disc.
goto :EOF
-:: Create directories and copy our stuff there
+:: Create directories and copy the basic stuff there
:NEXT
rd /s /q "hybridcd"
mkdir "hybridcd"
@@ -32,7 +44,8 @@
:: Copy our modified "freeldr.ini"
copy /y "hybridcd_freeldr.ini" "hybridcd\freeldr.ini"
+:: Copy the extra stuff
+xcopy /e "hybridcd_extras" "hybridcd"
-echo The basic stuff has been prepared in the directory "hybridcd".
-echo Now add everything else you want into this directory and run
-echo "hybridcd_step2" afterwards to create the ISO.
+:: Create the ISO
+mkisofs -iso-level 4 -volid "ReactOS-HybridCD" -b "loader/isoboot.bin" -no-emul-boot -boot-load-size 4 -hide "boot.catalog" -o "hybridcd.iso" "hybridcd"
Author: cfinck
Date: Wed Mar 10 17:05:55 2010
New Revision: 46059
URL: http://svn.reactos.org/svn/reactos?rev=46059&view=rev
Log:
- Add a script for creating a Hybrid-CD (combined Boot-CD & Live-CD).
Kudos for this go to Andrew Greenwood, I just scripted his way of creating the disc.
- Combining them also requires changing the Live-CD directory in the kernel to "live", which renders regular Live-CDs created in this tree unbootable.
Added:
branches/ros-branch-0_3_11-clt2010/reactos/hybridcd_freeldr.ini (with props)
branches/ros-branch-0_3_11-clt2010/reactos/hybridcd_step1.cmd (with props)
branches/ros-branch-0_3_11-clt2010/reactos/hybridcd_step2.cmd (with props)
Modified:
branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/io/iomgr/arcname.c
Added: branches/ros-branch-0_3_11-clt2010/reactos/hybridcd_freeldr.ini
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react…
==============================================================================
--- branches/ros-branch-0_3_11-clt2010/reactos/hybridcd_freeldr.ini (added)
+++ branches/ros-branch-0_3_11-clt2010/reactos/hybridcd_freeldr.ini [iso-8859-1] Wed Mar 10 17:05:55 2010
@@ -1,0 +1,32 @@
+[FREELOADER]
+DefaultOS=ReactOS
+Timeout=10
+
+[Display]
+TitleText=ReactOS @ CLT2010
+StatusBarColor=Cyan
+StatusBarTextColor=Black
+BackdropTextColor=White
+BackdropColor=Blue
+BackdropFillStyle=Medium
+TitleBoxTextColor=White
+TitleBoxColor=Red
+MessageBoxTextColor=White
+MessageBoxColor=Blue
+MenuTextColor=White
+MenuColor=Blue
+TextColor=Yellow
+SelectedTextColor=Black
+SelectedColor=Gray
+
+[Operating Systems]
+Live="ReactOS Live-System starten"
+Install="ReactOS-Installation starten"
+
+[Live]
+BootType=ReactOS
+SystemPath=LiveCD\live
+Options=/DEBUGPORT=COM1 /SOS
+
+[Install]
+BootType=ReactOSSetup
Propchange: branches/ros-branch-0_3_11-clt2010/reactos/hybridcd_freeldr.ini
------------------------------------------------------------------------------
svn:eol-style = CRLF
Added: branches/ros-branch-0_3_11-clt2010/reactos/hybridcd_step1.cmd
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react…
==============================================================================
--- branches/ros-branch-0_3_11-clt2010/reactos/hybridcd_step1.cmd (added)
+++ branches/ros-branch-0_3_11-clt2010/reactos/hybridcd_step1.cmd [iso-8859-1] Wed Mar 10 17:05:55 2010
@@ -1,0 +1,38 @@
+:: Script to create a Hybrid-CD (Boot-CD + Live-CD) for demo purposes.
+:: Only run it from the root "reactos" dir (where you would also call "make").
+::
+:: Written by Colin Finck (2010-03-10)
+::
+:: STEP 1 - Prepare the basic files for the CD
+::
+
+@echo off
+
+:: Ensure that the user already built Boot-CDs and Live-CDs
+if exist "output-i386\bootcd\." (
+ if exist "output-i386\livecd\." (
+ goto NEXT
+ )
+)
+
+echo Please build regular Boot-CDs and Live-CDs first!
+goto :EOF
+
+:: Create directories and copy our stuff there
+:NEXT
+rd /s /q "hybridcd"
+mkdir "hybridcd"
+mkdir "hybridcd\live"
+mkdir "hybridcd\Profiles"
+
+xcopy /e "output-i386\bootcd" "hybridcd"
+xcopy /e "output-i386\livecd\reactos" "hybridcd\live"
+xcopy /e "output-i386\livecd\Profiles" "hybridcd\Profiles"
+
+:: Copy our modified "freeldr.ini"
+copy /y "hybridcd_freeldr.ini" "hybridcd\freeldr.ini"
+
+
+echo The basic stuff has been prepared in the directory "hybridcd".
+echo Now add everything else you want into this directory and run
+echo "hybridcd_step2" afterwards to create the ISO.
Propchange: branches/ros-branch-0_3_11-clt2010/reactos/hybridcd_step1.cmd
------------------------------------------------------------------------------
svn:eol-style = CRLF
Added: branches/ros-branch-0_3_11-clt2010/reactos/hybridcd_step2.cmd
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react…
==============================================================================
--- branches/ros-branch-0_3_11-clt2010/reactos/hybridcd_step2.cmd (added)
+++ branches/ros-branch-0_3_11-clt2010/reactos/hybridcd_step2.cmd [iso-8859-1] Wed Mar 10 17:05:55 2010
@@ -1,0 +1,25 @@
+:: Script to create a Hybrid-CD (Boot-CD + Live-CD) for demo purposes.
+:: Only run it from the root "reactos" dir (where you would also call "make").
+::
+:: Written by Colin Finck (2010-03-10)
+::
+:: STEP 2 - Create the ISO
+::
+
+@echo off
+
+:: Ensure that "mkisofs" exists
+if exist "mkisofs.exe" (
+ goto NEXT
+)
+
+echo mkisofs.exe was not found in the current directory.
+echo Please get a correct version for it. (e.g. from "PE Builder" at http://nu2.nu)
+echo.
+echo Our cdmake doesn't support creating an ISO9660:1999 filesystem, which is
+echo important for a universally usable disc.
+goto :EOF
+
+:: Use it
+:NEXT
+mkisofs -iso-level 4 -volid "ReactOS-HybridCD" -b "loader/isoboot.bin" -no-emul-boot -boot-load-size 4 -hide "boot.catalog" -o "hybridcd.iso" "hybridcd"
Propchange: branches/ros-branch-0_3_11-clt2010/reactos/hybridcd_step2.cmd
------------------------------------------------------------------------------
svn:eol-style = CRLF
Modified: branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/io/iomgr/arcname.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11-clt2010/react…
==============================================================================
--- branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/io/iomgr/arcname.c [iso-8859-1] (original)
+++ branches/ros-branch-0_3_11-clt2010/reactos/ntoskrnl/io/iomgr/arcname.c [iso-8859-1] Wed Mar 10 17:05:55 2010
@@ -38,7 +38,7 @@
extern BOOLEAN InitIsWinPEMode, ExpInTextModeSetup;
/* Change this if you want ROS to boot properly from another directory */
- sprintf(RosSysPath, "%s", "reactos");
+ sprintf(RosSysPath, "%s", "live");
/* Only ARC Name left - Build full ARC Name */
p = strstr(KeLoaderBlock->ArcBootDeviceName, "cdrom");