diff options
Diffstat (limited to 'packages/initrdscripts')
8 files changed, 22 insertions, 11 deletions
diff --git a/packages/initrdscripts/files/30-bootmenu.sh b/packages/initrdscripts/files/30-bootmenu.sh index 5b3e7782f4..1bb53d20a3 100644 --- a/packages/initrdscripts/files/30-bootmenu.sh +++ b/packages/initrdscripts/files/30-bootmenu.sh @@ -1,3 +1,7 @@ +# +# (c) 2007 Paul Sokolovsky +# + # If root is explicitly specified, skip interactive selection if [ -z "$ROOT_DEVICE" ]; then ############################## @@ -52,7 +56,9 @@ get_menu_selection() get_partition_type() { - fstype=`mount -f --guess-fstype /dev/$dev $MOUNTLOC` +# fstype=`mount -f --guess-fstype /dev/$dev $MOUNTLOC` + fstype=`fstype </dev/$dev` + fstype=`expr "$fstype" : 'FSTYPE=\([A-Za-z0-9]*\).*'` } scan_for_loopimgs() diff --git a/packages/initrdscripts/initramfs-jffs2_0.1.bb b/packages/initrdscripts/initramfs-jffs2_0.1.bb index 3e11465536..f938b9d3b1 100644 --- a/packages/initrdscripts/initramfs-jffs2_0.1.bb +++ b/packages/initrdscripts/initramfs-jffs2_0.1.bb @@ -1,8 +1,9 @@ SRC_URI = "file://jffs2boot.sh" -PR = "r1" +PR = "r2" do_install() { install -m 0755 ${WORKDIR}/jffs2boot.sh ${D}/init } +PACKAGE_ARCH = "all" FILES_${PN} += " /init " diff --git a/packages/initrdscripts/initramfs-module-block_1.0.bb b/packages/initrdscripts/initramfs-module-block_1.0.bb index 73f7a709f1..72812a2490 100644 --- a/packages/initrdscripts/initramfs-module-block_1.0.bb +++ b/packages/initrdscripts/initramfs-module-block_1.0.bb @@ -1,5 +1,5 @@ SRC_URI = "file://85-blockboot.sh" -PR = "r0" +PR = "r1" RDEPENDS = "initramfs-uniboot" DESCRIPTION = "An initramfs module for booting off normal block devices." @@ -8,4 +8,5 @@ do_install() { install -m 0755 ${WORKDIR}/85-blockboot.sh ${D}/initrd.d/ } +PACKAGE_ARCH = "all" FILES_${PN} += " /initrd.d/* " diff --git a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb index 3fc8647f6c..002acff0a9 100644 --- a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb +++ b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb @@ -1,6 +1,6 @@ SRC_URI = "file://30-bootmenu.sh" -PR = "r1" -RDEPENDS = "util-linux-mount initramfs-uniboot initramfs-module-block initramfs-module-loop" +PR = "r3" +RDEPENDS = "klibc-utils-fstype initramfs-uniboot initramfs-module-block initramfs-module-loop" DESCRIPTION = "An initramfs module with UI for selection of boot device." do_install() { @@ -8,4 +8,5 @@ do_install() { install -m 0755 ${WORKDIR}/30-bootmenu.sh ${D}/initrd.d/ } +PACKAGE_ARCH = "all" FILES_${PN} += " /initrd.d/* " diff --git a/packages/initrdscripts/initramfs-module-initfs_1.0.bb b/packages/initrdscripts/initramfs-module-initfs_1.0.bb index 48ae6c2160..64bba4a304 100644 --- a/packages/initrdscripts/initramfs-module-initfs_1.0.bb +++ b/packages/initrdscripts/initramfs-module-initfs_1.0.bb @@ -1,5 +1,5 @@ SRC_URI = "file://10-initfs.sh" -PR = "r1" +PR = "r2" DESCRIPTION = "An initramfs module for initializing filesystems." RDEPENDS = "initramfs-uniboot" RRECOMMENDS = "kernel-module-vfat kernel-module-ext2" @@ -9,4 +9,5 @@ do_install() { install -m 0755 ${WORKDIR}/10-initfs.sh ${D}/initrd.d/ } +PACKAGE_ARCH = "all" FILES_${PN} += " /initrd.d/* " diff --git a/packages/initrdscripts/initramfs-module-loop_1.0.bb b/packages/initrdscripts/initramfs-module-loop_1.0.bb index 5cc84bcaf8..1a2d0a9754 100644 --- a/packages/initrdscripts/initramfs-module-loop_1.0.bb +++ b/packages/initrdscripts/initramfs-module-loop_1.0.bb @@ -1,5 +1,5 @@ SRC_URI = "file://80-loopboot.sh" -PR = "r1" +PR = "r2" DESCRIPTION = "An initramfs module for booting a filesystem image by loopback \ mounting it." RDEPENDS = "initramfs-uniboot initramfs-module-initfs" @@ -10,4 +10,5 @@ do_install() { install -m 0755 ${WORKDIR}/80-loopboot.sh ${D}/initrd.d/ } +PACKAGE_ARCH = "all" FILES_${PN} += " /initrd.d/* " diff --git a/packages/initrdscripts/initramfs-module-nfs_1.0.bb b/packages/initrdscripts/initramfs-module-nfs_1.0.bb index 6555688fce..acf71adb92 100644 --- a/packages/initrdscripts/initramfs-module-nfs_1.0.bb +++ b/packages/initrdscripts/initramfs-module-nfs_1.0.bb @@ -1,5 +1,5 @@ SRC_URI = "file://80-nfsboot.sh" -PR = "r0" +PR = "r1" DESCRIPTION = "An initramfs module for booting via NFS." RDEPENDS = "initramfs-uniboot" RRECOMMENDS = "kernel-module-g-ether kernel-module-nfs" @@ -9,4 +9,5 @@ do_install() { install -m 0755 ${WORKDIR}/80-nfsboot.sh ${D}/initrd.d/ } +PACKAGE_ARCH = "all" FILES_${PN} += " /initrd.d/nfs " diff --git a/packages/initrdscripts/initramfs-uniboot_1.0.bb b/packages/initrdscripts/initramfs-uniboot_1.0.bb index f8d9d76936..167ce71ffe 100644 --- a/packages/initrdscripts/initramfs-uniboot_1.0.bb +++ b/packages/initrdscripts/initramfs-uniboot_1.0.bb @@ -1,11 +1,10 @@ SRC_URI = "file://init.sh" -PR = "r0" +PR = "r2" DESCRIPTON = "A modular initramfs init script system." -RDEPENDS = "busybox-static" -RRECOMMENDS = "kernel-module-uinput" do_install() { install -m 0755 ${WORKDIR}/init.sh ${D}/init } +PACKAGE_ARCH = "all" FILES_${PN} += " /init " |