diff options
13 files changed, 50 insertions, 20 deletions
diff --git a/packages/busybox/busybox-static-1.2.1/defconfig b/packages/busybox/busybox-static-1.2.1/defconfig index eb0b8d7c64..1807dab68e 100644 --- a/packages/busybox/busybox-static-1.2.1/defconfig +++ b/packages/busybox/busybox-static-1.2.1/defconfig @@ -603,8 +603,8 @@ CONFIG_ASH=y # Ash Shell Options # CONFIG_ASH_JOB_CONTROL=y -# CONFIG_ASH_READ_NCHARS is not set -# CONFIG_ASH_READ_TIMEOUT is not set +CONFIG_ASH_READ_NCHARS=y +CONFIG_ASH_READ_TIMEOUT=y CONFIG_ASH_ALIAS=y CONFIG_ASH_MATH_SUPPORT=y # CONFIG_ASH_MATH_SUPPORT_64 is not set diff --git a/packages/busybox/busybox-static_1.2.1.bb b/packages/busybox/busybox-static_1.2.1.bb index f3bff07530..519468039a 100644 --- a/packages/busybox/busybox-static_1.2.1.bb +++ b/packages/busybox/busybox-static_1.2.1.bb @@ -1,5 +1,5 @@ require busybox_${PV}.bb -PR = "r0" +PR = "r1" S = "${WORKDIR}/busybox-1.2.1" diff --git a/packages/dropbear/dropbear/init b/packages/dropbear/dropbear/init index d019bdb4ba..5c8dfc12a8 100755 --- a/packages/dropbear/dropbear/init +++ b/packages/dropbear/dropbear/init @@ -50,10 +50,16 @@ gen_keys() { for t in $DROPBEAR_KEYTYPES; do case $t in rsa) - test -f $DROPBEAR_RSAKEY || dropbearkey -t rsa -f $DROPBEAR_RSAKEY + if [ ! -f $DROPBEAR_RSAKEY ]; then + echo "Creating $DESC RSA host key." + dropbearkey -t rsa -f $DROPBEAR_RSAKEY + fi ;; dsa) - test -f $DROPBEAR_DSSKEY || dropbearkey -t dss -f $DROPBEAR_DSSKEY + if [ ! -f $DROPBEAR_DSSKEY ]; then + echo "Creating $DESC DSA host key." + dropbearkey -t dss -f $DROPBEAR_DSSKEY + fi ;; esac done @@ -61,8 +67,8 @@ done case "$1" in start) - echo -n "Starting $DESC: " gen_keys + echo -n "Starting $DESC: " KEY_ARGS="" test -f $DROPBEAR_DSSKEY && KEY_ARGS="$KEY_ARGS -d $DROPBEAR_DSSKEY" test -f $DROPBEAR_RSAKEY && KEY_ARGS="$KEY_ARGS -r $DROPBEAR_RSAKEY" diff --git a/packages/dropbear/dropbear_0.49.bb b/packages/dropbear/dropbear_0.49.bb index f98c0ac8f6..0ed386ca0c 100644 --- a/packages/dropbear/dropbear_0.49.bb +++ b/packages/dropbear/dropbear_0.49.bb @@ -1 +1,3 @@ +PR = "r1" + require dropbear.inc diff --git a/packages/initrdscripts/files/10-initfs.sh b/packages/initrdscripts/files/10-initfs.sh new file mode 100644 index 0000000000..b336af6bbb --- /dev/null +++ b/packages/initrdscripts/files/10-initfs.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +modprobe vfat +modprobe ext2 +modprobe ext3 diff --git a/packages/initrdscripts/files/loopboot.sh b/packages/initrdscripts/files/80-loopboot.sh index 55a1948db8..7fbf69a202 100644 --- a/packages/initrdscripts/files/loopboot.sh +++ b/packages/initrdscripts/files/80-loopboot.sh @@ -35,7 +35,6 @@ if [ "$ROOT_DEVICE" = "/dev/loop" ]; then loop_num=`expr "$loop_num" + 1` } - modprobe vfat modprobe loop loop_num=0 diff --git a/packages/initrdscripts/files/nfsboot.sh b/packages/initrdscripts/files/80-nfsboot.sh index 5129a53ebb..5129a53ebb 100644 --- a/packages/initrdscripts/files/nfsboot.sh +++ b/packages/initrdscripts/files/80-nfsboot.sh diff --git a/packages/initrdscripts/files/blockboot.sh b/packages/initrdscripts/files/85-blockboot.sh index 567f7e29b3..567f7e29b3 100644 --- a/packages/initrdscripts/files/blockboot.sh +++ b/packages/initrdscripts/files/85-blockboot.sh diff --git a/packages/initrdscripts/files/init.sh b/packages/initrdscripts/files/init.sh index 8c9803f21b..f8d5de9173 100644 --- a/packages/initrdscripts/files/init.sh +++ b/packages/initrdscripts/files/init.sh @@ -2,14 +2,17 @@ MODULE_DIR=/initrd.d BOOT_ROOT= -ROOT_DEVICE=/dev/null +ROOT_DEVICE= early_setup() { mkdir /proc mount -t proc proc /proc mkdir /mnt +} - echo -n "creating device nodes: " +dev_setup() +{ + echo -n "initramfs: Creating device nodes: " grep '^ *[0-9]' /proc/partitions | while read major minor blocks dev do if [ ! -e /dev/$dev ]; then @@ -35,6 +38,7 @@ read_args() { load_modules() { for module in $MODULE_DIR/*; do + echo "initramfs: Loading $module module" source $module done } @@ -60,6 +64,8 @@ if [ -n "$rootdelay" ]; then sleep $rootdelay fi +dev_setup + load_modules [ -n "$BOOT_ROOT" ] && boot_root boot_failed diff --git a/packages/initrdscripts/initramfs-module-block_0.1.bb b/packages/initrdscripts/initramfs-module-block_1.0.bb index a0cb2fd7fa..73f7a709f1 100644 --- a/packages/initrdscripts/initramfs-module-block_0.1.bb +++ b/packages/initrdscripts/initramfs-module-block_1.0.bb @@ -1,11 +1,11 @@ -SRC_URI = "file://blockboot.sh" -PR = "r2" +SRC_URI = "file://85-blockboot.sh" +PR = "r0" RDEPENDS = "initramfs-uniboot" DESCRIPTION = "An initramfs module for booting off normal block devices." do_install() { install -d ${D}/initrd.d - install -m 0755 ${WORKDIR}/blockboot.sh ${D}/initrd.d/block + install -m 0755 ${WORKDIR}/85-blockboot.sh ${D}/initrd.d/ } -FILES_${PN} += " /initrd.d/block " +FILES_${PN} += " /initrd.d/* " diff --git a/packages/initrdscripts/initramfs-module-initfs_1.0.bb b/packages/initrdscripts/initramfs-module-initfs_1.0.bb new file mode 100644 index 0000000000..f085dcd0bc --- /dev/null +++ b/packages/initrdscripts/initramfs-module-initfs_1.0.bb @@ -0,0 +1,12 @@ +SRC_URI = "file://10-initfs.sh" +PR = "r0" +DESCRIPTION = "An initramfs module for initializing filesystems." +RDEPENDS = "initramfs-uniboot" +RRECOMMENDS = "kernel-module-vfat kernel-module-ext2" + +do_install() { + install -d ${D}/initrd.d + install -m 0755 ${WORKDIR}/10-initfs.sh ${D}/initrd.d/ +} + +FILES_${PN} += " /initrd.d/* " diff --git a/packages/initrdscripts/initramfs-module-loop_0.1.bb b/packages/initrdscripts/initramfs-module-loop_1.0.bb index d4e5aa038f..54e7fa29e3 100644 --- a/packages/initrdscripts/initramfs-module-loop_0.1.bb +++ b/packages/initrdscripts/initramfs-module-loop_1.0.bb @@ -1,5 +1,5 @@ -SRC_URI = "file://loopboot.sh" -PR = "r3" +SRC_URI = "file://80-loopboot.sh" +PR = "r0" DESCRIPTION = "An initramfs module for booting a filesystem image by loopback \ mounting it." RDEPENDS = "initramfs-uniboot" @@ -7,7 +7,7 @@ RRECOMMENDS = "kernel-module-loop kernel-module-vfat" do_install() { install -d ${D}/initrd.d - install -m 0755 ${WORKDIR}/loopboot.sh ${D}/initrd.d/loop + install -m 0755 ${WORKDIR}/80-loopboot.sh ${D}/initrd.d/ } -FILES_${PN} += " /initrd.d/loop " +FILES_${PN} += " /initrd.d/* " diff --git a/packages/initrdscripts/initramfs-module-nfs_0.1.bb b/packages/initrdscripts/initramfs-module-nfs_1.0.bb index 24284d6c5f..6555688fce 100644 --- a/packages/initrdscripts/initramfs-module-nfs_0.1.bb +++ b/packages/initrdscripts/initramfs-module-nfs_1.0.bb @@ -1,12 +1,12 @@ -SRC_URI = "file://nfsboot.sh" -PR = "r4" +SRC_URI = "file://80-nfsboot.sh" +PR = "r0" DESCRIPTION = "An initramfs module for booting via NFS." RDEPENDS = "initramfs-uniboot" RRECOMMENDS = "kernel-module-g-ether kernel-module-nfs" do_install() { install -d ${D}/initrd.d - install -m 0755 ${WORKDIR}/nfsboot.sh ${D}/initrd.d/nfs + install -m 0755 ${WORKDIR}/80-nfsboot.sh ${D}/initrd.d/ } FILES_${PN} += " /initrd.d/nfs " |