Author: jaeger Date: 2006-04-07 19:52:04 +0200 (Fri, 07 Apr 2006) New Revision: 1177 Added: crux-2.2/iso/isolinux/memtest86 crux-2.2/iso/isolinux/options.msg crux-2.2/iso/isolinux/roots.msg crux-2.2/ports/checkdups Modified: crux-2.2/Makefile crux-2.2/iso/bin/setup crux-2.2/iso/isolinux/boot.msg crux-2.2/iso/isolinux/isolinux.cfg Log: crux-2.2: fixed kernel source permissions during setup, added boot messages, options, and memtest86 to isolinux and Makefile, added script for checking package duplicates for iso creation Modified: crux-2.2/Makefile =================================================================== --- crux-2.2/Makefile 2006-04-07 16:16:36 UTC (rev 1176) +++ crux-2.2/Makefile 2006-04-07 17:52:04 UTC (rev 1177) @@ -182,7 +182,7 @@ @echo "- Copying ISO specific files" @mkdir -p $(ISO_ROOT_DIR)/etc $(ISO_ROOT_DIR)/boot/isolinux @cp iso/syslinux-$(SYSLINUX_VERSION)/isolinux.bin $(ISO_ROOT_DIR)/boot/isolinux - @cp iso/isolinux/{isolinux.cfg,boot.msg} $(ISO_ROOT_DIR)/boot/isolinux + @cp iso/isolinux/{isolinux.cfg,*.msg,memtest86} $(ISO_ROOT_DIR)/boot/isolinux @cp iso/etc/{fstab,hosts,inittab,issue,ld.so.conf,protocols,rc,rc.shutdown,rc.single,services} $(ISO_ROOT_DIR)/etc @echo "- Updating library links and cache" @ldconfig -r $(ISO_ROOT_DIR) Modified: crux-2.2/iso/bin/setup =================================================================== --- crux-2.2/iso/bin/setup 2006-04-07 16:16:36 UTC (rev 1176) +++ crux-2.2/iso/bin/setup 2006-04-07 17:52:04 UTC (rev 1177) @@ -177,6 +177,7 @@ tar -C $ROOT/usr/src -xjf $KERNEL cp -f ./kernel/linux-$KERNEL_VERSION.config $ROOT/usr/src/linux-$KERNEL_VERSION/.config chown -R root.root $ROOT/usr/src/linux-$KERNEL_VERSION + chmod -R go-w $ROOT/usr/src/linux-$KERNEL_VERSION shopt -s nullglob for patch in ./kernel/linux-$KERNEL_VERSION-*.patch; do patch -s -d $ROOT/usr/src/linux-$KERNEL_VERSION -p1 < $patch Modified: crux-2.2/iso/isolinux/boot.msg =================================================================== --- crux-2.2/iso/isolinux/boot.msg 2006-04-07 16:16:36 UTC (rev 1176) +++ crux-2.2/iso/isolinux/boot.msg 2006-04-07 17:52:04 UTC (rev 1177) @@ -1,7 +1,13 @@ Welcome to CRUX 2.2 -Press <Enter> to boot using the CD-ROM (/dev/hdc) as root filesystem. +Press <ENTER> to boot using the CD-ROM (default: /dev/hdc) as +the root filesystem. -To change root filesystem type: CRUX root=/dev/<device> -To disable ACPI type: CRUX acpi=off +Available kernels: + CRUX (install CRUX) + memtest86 (test your system's RAM) +Press F2 to see options for changing the root filesystem. + (if your CDROM is not the secondary master device, look here.) +Press F3 to see miscellaneous boot options (acpi, etc.) + Modified: crux-2.2/iso/isolinux/isolinux.cfg =================================================================== --- crux-2.2/iso/isolinux/isolinux.cfg 2006-04-07 16:16:36 UTC (rev 1176) +++ crux-2.2/iso/isolinux/isolinux.cfg 2006-04-07 17:52:04 UTC (rev 1177) @@ -2,6 +2,14 @@ DISPLAY /boot/isolinux/boot.msg PROMPT 1 DEFAULT CRUX + +F1 boot.msg +F2 roots.msg +F3 options.msg + LABEL CRUX KERNEL /boot/vmlinuz APPEND root=/dev/hdc ro console=ttyS0,38400 console=tty0 + +LABEL memtest86 + KERNEL memtest86 Added: crux-2.2/iso/isolinux/memtest86 =================================================================== (Binary files differ) Property changes on: crux-2.2/iso/isolinux/memtest86 ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: crux-2.2/iso/isolinux/options.msg =================================================================== --- crux-2.2/iso/isolinux/options.msg (rev 0) +++ crux-2.2/iso/isolinux/options.msg 2006-04-07 17:52:04 UTC (rev 1177) @@ -0,0 +1,13 @@ + +Boot options: + + acpi=off This option disables ACPI; it's required to use APM (older + non-acpi hardware) and also disables hyperthreading. Try + this if your hardware is older and has trouble booting the + default way. + + console=<blah> This option configures serial port access for the boot CD. + The format is "device,connection options", the default is + "ttyS0,38400". Connection options are comma-separated. For + example: console=9600,8,n,1 + Added: crux-2.2/iso/isolinux/roots.msg =================================================================== --- crux-2.2/iso/isolinux/roots.msg (rev 0) +++ crux-2.2/iso/isolinux/roots.msg 2006-04-07 17:52:04 UTC (rev 1177) @@ -0,0 +1,17 @@ + +Root filesystem: + + The default root filesystem is /dev/hdc, which corresponds to the + secondary master in the IDE chain. If your CDROM drive is not the + secondary master, you'll need to pass the root filesystem device + accordingly. Use the following table: + + Primary master: hda + Primary slave: hdb + Secondary master: hdc + Secondary slave: hdd + + So if your CDROM drive is the primary slave, boot with the following: + + CRUX root=/dev/hdb + Added: crux-2.2/ports/checkdups =================================================================== --- crux-2.2/ports/checkdups (rev 0) +++ crux-2.2/ports/checkdups 2006-04-07 17:52:04 UTC (rev 1177) @@ -0,0 +1,11 @@ +#!/bin/sh + +echo "Checking for duplicate packages..." + +DUPS="`find . -name \"*.pkg.tar.gz\" | cut -d/ -f4 | cut -d# -f1 | uniq -d`" + +if [ ! -z "$DUPS" ] +then + echo "Duplicate(s) found:" + echo $DUPS +fi Property changes on: crux-2.2/ports/checkdups ___________________________________________________________________ Name: svn:executable + *