Signed-off-by: Loui Chang <louipc.ist@gmail.com> --- README | 20 ++++++++++---------- archiso/hooks/archiso | 2 +- archiso/mkarchiso | 4 ++-- configs/default/menu.lst | 2 +- configs/install-iso/boot-files/grub/menu.lst | 4 ++-- configs/install-iso/boot-files/help/contrib.txt | 18 +++++++++--------- configs/install-iso/boot-files/isolinux/boot.msg | 2 +- .../install-iso/boot-files/isolinux/options.msg | 4 ++-- configs/install-iso/boot-files/releasenotes.txt | 2 +- configs/install-iso/instructions | 16 +++++++++------- configs/xfce4/Makefile | 2 +- configs/xfce4/overlay/boot/grub/menu.lst | 2 +- 12 files changed, 40 insertions(+), 38 deletions(-) diff --git a/README b/README index 68c09cd..774abe7 100644 --- a/README +++ b/README @@ -2,16 +2,16 @@ Archiso For Dummies Like Me and You ------------------------------------- --What the hell is Archiso? +- What the hell is Archiso? Archiso is a small set of bash scripts that is capable of building fully -functional ArchLinux-based liveCDs. It is a very generic tool, so it +functional Arch Linux based live CDs. It is a very generic tool, so it could potentially be used to generate anything from rescue systems, -to install disks, to special interest liveCD systems, and who knows what +to install disks, to special interest live CD systems, and who knows what else. Simply put, if it involves Arch on a shiny coaster, it can do it. --Alright, so how does one install it? +- Alright, so how does one install it? First off, Archiso has some dependencies: - mkinitcpio @@ -22,7 +22,7 @@ Archiso itself can be installed with the handy dandy included Makefile, and the incantation 'make install'. --Great, so how do you use this thing? +- Great, so how do you use this thing? The heart and soul of Archiso is mkarchiso. All of its options are documented in its usage output, so we won't go into detail here. @@ -44,13 +44,13 @@ initcpio really belong here, fancier stuff can be done on the booted system anyway. You'll also want to create a list of packages you want installed on your -liveCD system. A file full of package names, one-per-line, is the format +live CD system. A file full of package names, one-per-line, is the format for this. Typically you'll want BASE and a kernel as a bare minimum, but -you're free to install whatever else you want (this is *great* for -special interest liveCDs, just specify packages you want and gogogo). +you're free to install whatever else you want. This is *great* for +special interest live CDs, just specify packages you want and gogogo. The last item of importance is what are called addons. Basically this -means any other crap you might want to include on your liveCD, including +means any other crap you might want to include on your live CD, including binary package repos, special configurations, random files, we don't know, be creative. mkarchiso expects them all to be put in a single directory, with an fstab-like config file. Currently two types of addons @@ -79,7 +79,7 @@ If you want to add plain directories to bind mount: core /packages bind where the first component is the path to the directory relative to your addons directory, the second component is where you'd like it - bind-mounted relative to the liveCD's root filesystem, and the last + bind-mounted relative to the live CD's root filesystem, and the last component is the type. vim: textwidth=72 diff --git a/archiso/hooks/archiso b/archiso/hooks/archiso index 65e849e..3df0dcc 100644 --- a/archiso/hooks/archiso +++ b/archiso/hooks/archiso @@ -146,7 +146,7 @@ run_hook () udevpid=$(/bin/minips -C udevd -o pid=) [ "x${udevpid}" != "x" ] && /bin/kill -9 $udevpid 2>&1 >/dev/null #Yep, we're bailing out here. We don't need kinit. - msg ":: Passing control to Archlinux Initscripts...Please Wait" + msg ":: Passing control to Arch Linux Initscripts...Please Wait" /bin/umount /sys /bin/umount /proc exec /bin/run-init -c /dev/console /real_root /sbin/init ${CMDLINE} diff --git a/archiso/mkarchiso b/archiso/mkarchiso index e868e8b..9ed73ff 100755 --- a/archiso/mkarchiso +++ b/archiso/mkarchiso @@ -249,8 +249,8 @@ command_iso () { mkisofs ${qflag} -r -l $bootflags -uid 0 -gid 0 \ -input-charset utf-8 -p "prepared by mkarchiso" \ -no-emul-boot -boot-load-size 4 -boot-info-table \ - -publisher "ArchLinux <archlinux.org>" \ - -A "ArchLinux Live/Rescue CD" \ + -publisher "Arch Linux <http://www.archlinux.org>" \ + -A "Arch Linux Live/Rescue CD" \ -o "${imgname}" "${work_dir}/iso/" } diff --git a/configs/default/menu.lst b/configs/default/menu.lst index cf9823f..0852720 100644 --- a/configs/default/menu.lst +++ b/configs/default/menu.lst @@ -3,7 +3,7 @@ default 0 color light-blue/blue black/light-grey splashimage=/boot/splash.xpm.gz -title Boot ArchLinux LiveCD +title Boot Arch Linux Live CD kernel /boot/vmlinuz26 lang=en locale=en_US.UTF-8 ramdisk_size=75% initrd /boot/archiso.img diff --git a/configs/install-iso/boot-files/grub/menu.lst b/configs/install-iso/boot-files/grub/menu.lst index 067985d..d8b8446 100644 --- a/configs/install-iso/boot-files/grub/menu.lst +++ b/configs/install-iso/boot-files/grub/menu.lst @@ -3,11 +3,11 @@ default 0 color light-blue/blue black/light-grey splashimage=/boot/splash.xpm.gz -title Boot ArchLinux LiveCD +title Boot Arch Linux LiveCD kernel /boot/vmlinuz26 lang=en locale=en_US.UTF-8 ramdisk_size=75% initrd /boot/archiso_pata.img -title Boot ArchLinux LiveCD [Legacy IDE, no SATA] +title Boot Arch Linux LiveCD [Legacy IDE, no SATA] kernel /boot/vmlinuz26 lang=en locale=en_US.UTF-8 ramdisk_size=75% initrd /boot/archiso_ide.img diff --git a/configs/install-iso/boot-files/help/contrib.txt b/configs/install-iso/boot-files/help/contrib.txt index b25f56f..7720865 100644 --- a/configs/install-iso/boot-files/help/contrib.txt +++ b/configs/install-iso/boot-files/help/contrib.txt @@ -2,15 +2,15 @@ HOW-TO: Contribute to this help ------------------------------- This help is rather simplistic. -In order to provide help files or translations you simply need to make a text -file. Formatting is important (due to grub limitations). The files MUST be 80 -characters wide, and 23 lines long. Any more, and your formatting will be -corrupted when viewing the help. Please note that if your help is short, it is -worthwhile to pad with empty lines, up to 23 lines. - -Please post any and all help files you wish to contribute, to the ArchLinux bug -tracker at http://bugs.archlinux.org - +In order to provide help files or translations you simply need to make a +text file. Formatting is important (due to grub limitations). The +files MUST be less than 80 characters wide, and 23 lines long. +Any more, and your formatting will be corrupted when viewing the help. +Please note that if your help is short, it is worthwhile to pad with +empty lines, up to 23 lines. + +Please post any and all help files you wish to contribute, to the +Arch Linux bug tracker at http://bugs.archlinux.org diff --git a/configs/install-iso/boot-files/isolinux/boot.msg b/configs/install-iso/boot-files/isolinux/boot.msg index 551956a..5405c49 100644 --- a/configs/install-iso/boot-files/isolinux/boot.msg +++ b/configs/install-iso/boot-files/isolinux/boot.msg @@ -1,6 +1,6 @@ splash.rle -ArchLinux Install and LiveCD (0e2009.0107) +Arch Linux Install and Live CD (0e2009.0107) 0eF207 -> more boot options 0eF307 -> Troubleshooting, Help diff --git a/configs/install-iso/boot-files/isolinux/options.msg b/configs/install-iso/boot-files/isolinux/options.msg index 86a6af4..8e38bbe 100644 --- a/configs/install-iso/boot-files/isolinux/options.msg +++ b/configs/install-iso/boot-files/isolinux/options.msg @@ -3,8 +3,8 @@ Boot flavors on this ISO: ---------------------------------- -0earch07 : ArchLinux LiveCD [pata] (the Default) -0earchide07 : ArchLinux LiveCD [legacy IDE mode] +0earch07 : Arch Linux Live CD [pata] (the Default) +0earchide07 : Arch Linux Live CD [legacy IDE mode] 0ememtest07 : Run memtest (Memory Testing) diff --git a/configs/install-iso/boot-files/releasenotes.txt b/configs/install-iso/boot-files/releasenotes.txt index 77417f3..213b3ae 100644 --- a/configs/install-iso/boot-files/releasenotes.txt +++ b/configs/install-iso/boot-files/releasenotes.txt @@ -1,4 +1,4 @@ -ArchLinux LiveCD - 2009.01 +Arch Linux Live CD - 2009.01 Release Notes -------------------------- diff --git a/configs/install-iso/instructions b/configs/install-iso/instructions index b14b456..cdf77ff 100644 --- a/configs/install-iso/instructions +++ b/configs/install-iso/instructions @@ -1,14 +1,14 @@ - ArchLinux + Arch Linux Installation and Live-CDs ---------------------------- -All CDs and USB-Images are installation mediums and Live-CDs, +All CDs and USB images are installation mediums and Live CDs which can be used as maintenance and rescue systems. FTP-ISOs/Images: ---------------- -These are the preferred install mediums for ArchLinux. You get always -the actual package versions using these mediums. +These are the preferred install mediums for Arch Linux. +You can always get up to date packages using these mediums. archlinux-200X.yy-ftp-i686.iso i686/32bit CD-ISO archlinux-200X.yy-ftp-i686.img i686/32bit USB-Image @@ -23,7 +23,7 @@ ISOs with the isolinux bootloader: Core-ISOs/Images: ----------------- -These are for offline installations when no Internet access available +These are for offline installations when no Internet access is available to install the base system. archlinux-200X.yy-core-i686.iso i686/32bit CD-ISO @@ -33,7 +33,8 @@ to install the base system. How to use these installation images: ------------------------------------- -Please ensure the sha1sum matches that in the SHA1SUMS file in this directory +Please ensure the sha1sum for your downloaded file matches the checksum +in the the SHA1SUMS file in this directory. See section in the "Arch Linux Install Guide": http://wiki.archlinux.org/index.php/Official_Arch_Linux_Install_Guide#Pre-In... @@ -42,4 +43,5 @@ For the USB-Images see: Happy installing! Happy ARCHing! -- ArchLinux Release Engineering team +- Arch Linux Release Engineering team + diff --git a/configs/xfce4/Makefile b/configs/xfce4/Makefile index 6a609fb..f4d3009 100644 --- a/configs/xfce4/Makefile +++ b/configs/xfce4/Makefile @@ -1,7 +1,7 @@ # I'm a make retard, there are probably prettier ways of doing this... WORKING_DIR=$(PWD)/.work -ISO_NAME=$(PWD)/Archlinux-XFCE4-Live.iso +ISO_NAME=$(PWD)/archlinux-xfce4-live.iso all: iso diff --git a/configs/xfce4/overlay/boot/grub/menu.lst b/configs/xfce4/overlay/boot/grub/menu.lst index 6755d09..4cd24a3 100644 --- a/configs/xfce4/overlay/boot/grub/menu.lst +++ b/configs/xfce4/overlay/boot/grub/menu.lst @@ -3,7 +3,7 @@ default 0 color light-blue/blue black/light-grey splashimage=/boot/splash.xpm.gz -title Boot ArchLinux LiveCD +title Boot Arch Linux Live CD kernel /boot/vmlinuz26 lang=en locale=en_US.UTF-8 ramdisk_size=75% initrd /boot/archiso.img -- 1.6.1