Author: sip Date: 2006-02-23 17:54:35 +0100 (Thu, 23 Feb 2006) New Revision: 759 Modified: crux-2.2/iso/bin/serial_console crux-2.2/iso/bin/setup crux-2.2/iso/etc/fstab crux-2.2/iso/etc/inittab crux-2.2/iso/etc/rc crux-2.2/iso/isolinux/boot.msg crux-2.2/iso/isolinux/isolinux.cfg Log: modified cdrom boot files: udev, version info, core collection Modified: crux-2.2/iso/bin/serial_console =================================================================== --- crux-2.2/iso/bin/serial_console 2006-02-23 16:31:31 UTC (rev 758) +++ crux-2.2/iso/bin/serial_console 2006-02-23 16:54:35 UTC (rev 759) @@ -8,8 +8,8 @@ # port. # -if stty -F /dev/tts/0 > /dev/null 2>&1; then - exec /sbin/agetty 38400 tts/0 vt100 +if stty -F /dev/ttyS0 > /dev/null 2>&1; then + exec /sbin/agetty 38400 ttyS0 vt100 else exec /usr/bin/sleep 365d fi Modified: crux-2.2/iso/bin/setup =================================================================== --- crux-2.2/iso/bin/setup 2006-02-23 16:31:31 UTC (rev 758) +++ crux-2.2/iso/bin/setup 2006-02-23 16:54:35 UTC (rev 759) @@ -20,7 +20,7 @@ # USA. # -VERSION="2.1" +VERSION="2.2" do_dialog() { dialog --backtitle "CRUX $VERSION Setup" --no-shadow "$@" @@ -74,8 +74,8 @@ } select_packages() { - if [ ! -d base ] || [ ! -d opt ] || [ ! -d contrib ] || [ ! -d kernel ]; then - do_dialog --aspect 50 --msgbox "Package directories (base, opt, contrib and kernel) were not found in $crux_dir. Aborting." 0 0 + if [ ! -d core ] || [ ! -d opt ] || [ ! -d contrib ] || [ ! -d kernel ]; then + do_dialog --aspect 50 --msgbox "Package directories (core, opt, contrib and kernel) were not found in $crux_dir. Aborting." 0 0 exit 1 fi @@ -84,15 +84,15 @@ if [ "$ACTION" = "INSTALL" ]; then # Install TITLE="Select packages to install:" - BASE_LIST=`find base -name '*.pkg.tar.gz' -printf '%f (base) ON\n' | sed 's/.pkg.tar.gz//g' | sort | xargs echo ' '` - OPT_LIST=`find opt -name '*.pkg.tar.gz' -printf '%f (opt) OFF\n' | sed 's/.pkg.tar.gz//g' | sort | xargs echo ' '` + BASE_LIST=`find core -name '*.pkg.tar.gz' -printf '%f (core) ON\n' | sed 's/.pkg.tar.gz//g' | sort | xargs echo ' '` + OPT_LIST=`find opt -name '*.pkg.tar.gz' -printf '%f (opt) ON\n' | sed 's/.pkg.tar.gz//g' | sort | xargs echo ' '` CONTRIB_LIST=`find contrib -name '*.pkg.tar.gz' -printf '%f (contrib) OFF\n' | sed 's/.pkg.tar.gz//g' | sort | xargs echo ' '` else # Upgrade TITLE="Select packages to upgrade:" INSTALLED_PACKAGES=`pkginfo -r $ROOT -i | gawk '{ print $1; }'` for package in $INSTALLED_PACKAGES; do - BASE_LIST="$BASE_LIST `find base -name \"${package}#*.pkg.tar.gz\" -printf '%f (base) ON\n' | sed 's/.pkg.tar.gz/ /g' | sort | xargs echo ' '`" + BASE_LIST="$BASE_LIST `find core -name \"${package}#*.pkg.tar.gz\" -printf '%f (core) ON\n' | sed 's/.pkg.tar.gz/ /g' | sort | xargs echo ' '`" OPT_LIST="$OPT_LIST `find opt -name \"${package}#*.pkg.tar.gz\" -printf '%f (opt) ON\n' | sed 's/.pkg.tar.gz/ /g' | sort | xargs echo ' '`" CONTRIB_LIST="$CONTRIB_LIST `find contrib -name \"${package}#*.pkg.tar.gz\" -printf '%f (contrib) ON\n' | sed 's/.pkg.tar.gz/ /g' | sort | xargs echo ' '`" done Modified: crux-2.2/iso/etc/fstab =================================================================== --- crux-2.2/iso/etc/fstab 2006-02-23 16:31:31 UTC (rev 758) +++ crux-2.2/iso/etc/fstab 2006-02-23 16:54:35 UTC (rev 759) @@ -1,5 +1,5 @@ -/dev/cdroms/cdrom0 / iso9660 defaults 0 0 +/dev/hdc / iso9660 defaults 0 0 devpts /dev/pts devpts defaults 0 0 -proc /proc proc defaults 0 0 -sysfs /sys sysfs defaults 0 0 +none /proc proc defaults 0 0 +none /sys sysfs defaults 0 0 tmp /tmp tmpfs defaults 0 0 Modified: crux-2.2/iso/etc/inittab =================================================================== --- crux-2.2/iso/etc/inittab 2006-02-23 16:31:31 UTC (rev 758) +++ crux-2.2/iso/etc/inittab 2006-02-23 16:54:35 UTC (rev 759) @@ -9,12 +9,12 @@ rd:06:wait:/etc/rc.shutdown su:S:wait:/sbin/sulogin -p -c1:2:respawn:/sbin/agetty 38400 vc/1 linux -c2:2:respawn:/sbin/agetty 38400 vc/2 linux -c3:2:respawn:/sbin/agetty 38400 vc/3 linux -c4:2:respawn:/sbin/agetty 38400 vc/4 linux -c5:2:respawn:/sbin/agetty 38400 vc/5 linux -c6:2:respawn:/sbin/agetty 38400 vc/6 linux +c1:2:respawn:/sbin/agetty 38400 tty1 linux +c2:2:respawn:/sbin/agetty 38400 tty2 linux +c3:2:respawn:/sbin/agetty 38400 tty3 linux +c4:2:respawn:/sbin/agetty 38400 tty4 linux +c5:2:respawn:/sbin/agetty 38400 tty5 linux +c6:2:respawn:/sbin/agetty 38400 tty6 linux s1:2:respawn:/usr/bin/serial_console Modified: crux-2.2/iso/etc/rc =================================================================== --- crux-2.2/iso/etc/rc 2006-02-23 16:31:31 UTC (rev 758) +++ crux-2.2/iso/etc/rc 2006-02-23 16:54:35 UTC (rev 759) @@ -5,8 +5,10 @@ echo "The system is coming up. Please wait." -# Start device management daemon -/sbin/devfsd /dev +# Start udev +/bin/mount -n -t proc none /proc +/bin/mount -n -t sysfs none /sys +/sbin/start_udev # Mount filesystems /bin/mount -n -a &> /dev/null Modified: crux-2.2/iso/isolinux/boot.msg =================================================================== --- crux-2.2/iso/isolinux/boot.msg 2006-02-23 16:31:31 UTC (rev 758) +++ crux-2.2/iso/isolinux/boot.msg 2006-02-23 16:54:35 UTC (rev 759) @@ -1,6 +1,6 @@ - Welcome to CRUX 2.1 + Welcome to CRUX 2.2 -Press <Enter> to boot using the CD-ROM (/dev/cdroms/cdrom0) as root filesystem. +Press <Enter> to boot using the CD-ROM (/dev/hdc) as root filesystem. To change root filesystem type: CRUX root=/dev/<device> To disable ACPI type: CRUX acpi=off Modified: crux-2.2/iso/isolinux/isolinux.cfg =================================================================== --- crux-2.2/iso/isolinux/isolinux.cfg 2006-02-23 16:31:31 UTC (rev 758) +++ crux-2.2/iso/isolinux/isolinux.cfg 2006-02-23 16:54:35 UTC (rev 759) @@ -4,4 +4,4 @@ DEFAULT CRUX LABEL CRUX KERNEL /boot/vmlinuz - APPEND root=/dev/cdroms/cdrom0 ro console=ttyS0,38400 console=tty0 + APPEND root=/dev/hdc ro console=ttyS0,38400 console=tty0