Stefan Fiedler:

target/bootdisk/build_stage2.sh

@@ -7,7 +7,8 @@ mkdir -p $disksdir/2nd_stage
 cd $disksdir/2nd_stage
 mkdir -p mnt/source mnt/target
 #
-package_map='       +00-dirtree         +glibc22            +glibc23
+package_map="       +00-dirtree
++$ROCKCFG_PKG_GLIBC_BRANCH              +$ROCKCFG_PKG_BASH_DEFAULT
 -automake17         -automake18         -automake19         -gcc2
 -gcc33              -gcc34              -gcc40              -gcc41
 -gmp                -mpfr               -rockinitrd         +stone
@@ -24,7 +25,7 @@ package_map='       +00-dirtree         +glibc22            +glibc23
 -mine               -bize               -termcap            +ncurses
 +readline           -strace             -ltrace             -perl5
 -m4                 -time               -gettext            -zlib
-+bash2              +attr               +acl                +findutils
+                    +attr               +acl                +findutils
 +mktemp             +coreutils          -diffutils          -patch
 -make               +grep               +sed                +gzip
 +tar                +gawk               -flex               +bzip2
@@ -40,7 +41,7 @@ package_map='       +00-dirtree         +glibc22            +glibc23
 +netkit-base        +netkit-ftp         +netkit-telnet      +netkit-tftp
 +sysfiles           +libpcap            +iptables           +tcp_wrappers
 -kiss               +kbd		-syslinux           +ntfsprogs
--ethtool	    -uml_utilities	+ddrescue           +libelf'
+-ethtool	    -uml_utilities	+ddrescue           +libelf"
 
 if [ -f ../../pkgs/bize.tar.bz2 -a ! -f ../../pkgs/mine.tar.bz2 ] ; then
 	packager=bize

target/bootdisk/config.hlp

@@ -1,28 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/target/bootdisk/config.hlp
-# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-
-ROCKCFG_BOOTDISK_USEKISS
-  If this option is enabled the kiss shell is installed into the first
-  stage initrd of the bootdisk. This is helpful for unusual installations
-  and debugging. 
-

target/bootdisk/config.in

@@ -28,7 +28,6 @@ pkgfilter sed '
 / ed /		{ p; d; };	/ lrzsz /	{ p; d; };
 / minicom /	{ p; d; };	/ disktype /	{ p; d; };
 / netkit-base /	{ p; d; };	/ netkit-telnet / { p; d; };
-/ netkit-ftp /	{ p; d; };	/ netkit-tftp /	{ p; d; };
 / net-tools /   { p; d; };	/ sysvinit /    { p; d; };
 / pciutils /	{ p; d; };	/ portmap /	{ p; d; };
 / reiserfsprogs / { p; d; };	/ rsync /	{ p; d; };
@@ -41,14 +40,14 @@ pkgfilter sed '
 / mdadm /       { p; d; };      / ntfsprogs /   { P; d; };
 / ddrescue /    { p; d; };
 / iproute2 /	{ p; d; };	/ wget /	{ p; d; };
-/ kiss /	{ p; d; };	/ udev /	{ p; d; };
+				/ udev /	{ p; d; };
 / gmp /		{ p; d; };	/ rockinitrd /	{ p; d; };
 / linux=linux26 /	{ p; d; };
 / linux=linux26-source /	{ p; d; };
 
 
 # Select some non-base packages
-/ lzo /		{ p; d; };
+/ etcnet /	{ s/^O /X /; p; d; };
 
 # Select some packages explicitly (architectures)
 / bin86 /	{ p; d; };	/ cpuburn /	{ p; d; };
@@ -71,7 +70,10 @@ pkgfilter sed '
 / prelink /	{ s/^X /O /; p; d; };	/ ccache /	{ s/^X /O /; p; d; };
 / cracklib /	{ s/^X /O /; p; d; };	/ hotplug /	{ s/^X /O /; p; d; };
 / bash=bash3 /	{ s/^X /O /; p; d; };	/ pdksh /	{ s/^X /O /; p; d; };
-/ dietlibc /	{ s/^X /O /; p; d; };
+/ dietlibc /	{ s/^X /O /; p; d; };	/ rocknet /	{ s/^X /O /; p; d; };
+/ devfsd /	{ s/^X /O /; p; d; };	/ rockplug /	{ s/^X /O /; p; d; };
+/ netkit-ftp /	{ s/^X /O /; p; d; };	/ netkit-tftp /	{ s/^X /O /; p; d; };
+/ modutils /	{ s/^X /O /; p; d; };
 '
 
 ROCKCFGSET_CREATE_TARBZ2=1
@@ -82,6 +84,8 @@ ROCKCFGSET_PKG_GCC2_NO_CHILL=1
 ROCKCFGSET_PKG_GCC32_NO_JAVA=1
 ROCKCFGSET_PKG_GCC33_NO_JAVA=1
 ROCKCFGSET_PKG_GCC34_NO_JAVA=1
+ROCKCFGSET_PKG_GCC40_NO_JAVA=1
+ROCKCFGSET_PKG_GCC41_NO_JAVA=1
 ROCKCFGSET_PKG_BASH_PROGCOMP=0
 
 ROCKCFGSET_DO_REBUILD_STAGE=0

target/bootdisk/initrd/initrd_bootdisk

@@ -1,6 +1,7 @@
 /bin/tar /bin/tar
 /bin/gzip /bin/gzip
 /bin/bash2 /bin/bash2
+/bin/bash3 /bin/bash3
 /bin/bash /bin/bash
 /bin/sh /bin/sh
 /bin/mount /bin/mount
@@ -34,8 +35,8 @@
 /usr/bin/basename /usr/bin/basename
 /usr/bin/tr /usr/bin/tr
 /usr/sbin/lspci /usr/sbin/lspci
-/etc/udev etc/udev
-/lib/udev lib/udev
+/etc/udev /etc/udev
+/lib/udev /lib/udev
 /bin/ps /bin/ps
 /sbin/modinfo /sbin/modinfo
 /usr/bin/lsmod /usr/bin/lsmod