From: Jackie Huang Date: Tue, 6 Aug 2019 02:41:38 +0000 (+0800) Subject: init-install: fix rootfs.img not found issue X-Git-Tag: bronze-rc0~160 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=789722742b7ca889ebd2d47c79f05d22220ae7be;p=pti%2Frtp.git init-install: fix rootfs.img not found issue Ported from oe-core: https://github.com/jackiehjm/openembedded-core/commit/3670d379d8c18e08b18ca665d17d290b596b48bf Issue-ID: INF-4 Signed-off-by: Jackie Huang Change-Id: I644ef21316a12a49fe4c6e6667bee5ca67d561d2 --- diff --git a/meta-oran/recipes-core/initrdscripts/files/init-install-efi.sh b/meta-oran/recipes-core/initrdscripts/files/init-install-efi.sh new file mode 100644 index 0000000..46a6e36 --- /dev/null +++ b/meta-oran/recipes-core/initrdscripts/files/init-install-efi.sh @@ -0,0 +1,323 @@ +#!/bin/sh -e +# +# Copyright (c) 2012, Intel Corporation. +# All rights reserved. +# +# install.sh [device_name] [rootfs_name] +# + +PATH=/sbin:/bin:/usr/sbin:/usr/bin + +# figure out how big of a boot partition we need +boot_size=$(du -ms /run/media/$1/ | awk '{print $1}') +# remove rootfs.img ($2) from the size if it exists, as its not installed to /boot +if [ -e /run/media/$1/$2 ]; then + boot_size=$(( boot_size - $( du -ms /run/media/$1/$2 | awk '{print $1}') )) +fi +# remove initrd from size since its not currently installed +if [ -e /run/media/$1/initrd ]; then + boot_size=$(( boot_size - $( du -ms /run/media/$1/initrd | awk '{print $1}') )) +fi +# add 10M to provide some extra space for users and account +# for rounding in the above subtractions +boot_size=$(( boot_size + 10 )) + +# 5% for swap +swap_ratio=5 + +# Get a list of hard drives +hdnamelist="" +live_dev_name=`cat /proc/mounts | grep ${1%/} | awk '{print $1}'` +live_dev_name=${live_dev_name#\/dev/} +# Only strip the digit identifier if the device is not an mmc +case $live_dev_name in + mmcblk*) + ;; + nvme*) + ;; + *) + live_dev_name=${live_dev_name%%[0-9]*} + ;; +esac + +echo "Searching for hard drives ..." + +# Some eMMC devices have special sub devices such as mmcblk0boot0 etc +# we're currently only interested in the root device so pick them wisely +devices=`ls /sys/block/ | grep -v "mmcblk\|md\|dm"` || true +mmc_devices=`ls /sys/block/ | grep "mmcblk[0-9]\{1,\}$"` || true +md_devices=`cat /proc/mdstat |grep -w active |awk -F":" '{print $1}'` || true +devices="$devices $mmc_devices $md_devices" + +for device in $devices; do + case $device in + loop*) + # skip loop device + ;; + sr*) + # skip CDROM device + ;; + ram*) + # skip ram device + ;; + *) + # skip the device LiveOS is on + # Add valid hard drive name to the list + case $device in + $live_dev_name*) + # skip the device we are running from + ;; + *) + hdnamelist="$hdnamelist $device" + ;; + esac + ;; + esac +done + +if [ -z "${hdnamelist}" ]; then + echo "You need another device (besides the live device /dev/${live_dev_name}) to install the image. Installation aborted." + exit 1 +fi + +TARGET_DEVICE_NAME="" +for hdname in $hdnamelist; do + # Display found hard drives and their basic info + echo "-------------------------------" + echo /dev/$hdname + if [ -r /sys/block/$hdname/device/vendor ]; then + echo -n "VENDOR=" + cat /sys/block/$hdname/device/vendor + fi + if [ -r /sys/block/$hdname/device/model ]; then + echo -n "MODEL=" + cat /sys/block/$hdname/device/model + fi + if [ -r /sys/block/$hdname/device/uevent ]; then + echo -n "UEVENT=" + cat /sys/block/$hdname/device/uevent + fi + echo +done + +# Get user choice +while true; do + echo "Please select an install target or press n to exit ($hdnamelist ): " + read answer + if [ "$answer" = "n" ]; then + echo "Installation manually aborted." + exit 1 + fi + for hdname in $hdnamelist; do + if [ "$answer" = "$hdname" ]; then + TARGET_DEVICE_NAME=$answer + break + fi + done + if [ -n "$TARGET_DEVICE_NAME" ]; then + break + fi +done + +if [ -n "$TARGET_DEVICE_NAME" ]; then + echo "Installing image on /dev/$TARGET_DEVICE_NAME ..." +else + echo "No hard drive selected. Installation aborted." + exit 1 +fi + +device=/dev/$TARGET_DEVICE_NAME + +# +# The udev automounter can cause pain here, kill it +# +#rm -f /etc/udev/rules.d/automount.rules +#rm -f /etc/udev/scripts/mount* + +# +# Unmount anything the automounter had mounted +# +#umount ${device}* 2> /dev/null || /bin/true + +for dir in `awk '/\/dev.* \/run\/media/{print $2}' /proc/mounts | grep $TARGET_DEVICE_NAME`; do + umount $dir +done + +mkdir -p /tmp + +# Create /etc/mtab if not present +if [ ! -e /etc/mtab ] && [ -e /proc/mounts ]; then + ln -sf /proc/mounts /etc/mtab +fi + +disk_size=$(parted ${device} unit mb print | grep '^Disk .*: .*MB' | cut -d" " -f 3 | sed -e "s/MB//") + +swap_size=$((disk_size*swap_ratio/100)) +rootfs_size=$((disk_size-boot_size-swap_size)) + +rootfs_start=$((boot_size)) +rootfs_end=$((rootfs_start+rootfs_size)) +swap_start=$((rootfs_end)) + +# MMC devices are special in a couple of ways +# 1) they use a partition prefix character 'p' +# 2) they are detected asynchronously (need rootwait) +rootwait="" +part_prefix="" +if [ ! "${device#/dev/mmcblk}" = "${device}" ] || \ + [ ! "${device#/dev/nvme}" = "${device}" ]; then + part_prefix="p" + rootwait="rootwait" +fi + +# MD raid device use partition prefix charater 'p' +# and it need a larger capacity to store initrd, +# considering some debug purpose, enlarge it to 1G. +if [ ! "${device#/dev/md}" = "${device}" ]; then + part_prefix="p" + boot_size=1024 +fi + +# USB devices also require rootwait +if [ -n `readlink /dev/disk/by-id/usb* | grep $TARGET_DEVICE_NAME` ]; then + rootwait="rootwait" +fi + +bootfs=${device}${part_prefix}1 +rootfs=${device}${part_prefix}2 +swap=${device}${part_prefix}3 + +echo "*****************" +echo "Boot partition size: $boot_size MB ($bootfs)" +echo "Rootfs partition size: $rootfs_size MB ($rootfs)" +echo "Swap partition size: $swap_size MB ($swap)" +echo "*****************" +echo "Deleting partition table on ${device} ..." +dd if=/dev/zero of=${device} bs=512 count=35 + +echo "Creating new partition table on ${device} ..." +parted ${device} mklabel gpt + +echo "Creating boot partition on $bootfs" +parted ${device} mkpart boot fat32 0% $boot_size +parted ${device} set 1 boot on + +echo "Creating rootfs partition on $rootfs" +parted ${device} mkpart root ext4 $rootfs_start $rootfs_end + +echo "Creating swap partition on $swap" +parted ${device} mkpart swap linux-swap $swap_start 100% + +parted ${device} print + +echo "Waiting for device nodes..." +C=0 +while [ $C -ne 3 ] && [ ! -e $bootfs -o ! -e $rootfs -o ! -e $swap ]; do + C=$(( C + 1 )) + sleep 1 +done + +echo "Formatting $bootfs to vfat..." +mkfs.vfat $bootfs + +echo "Formatting $rootfs to ext4..." +mkfs.ext4 $rootfs + +echo "Formatting swap partition...($swap)" +mkswap $swap + +mkdir /tgt_root +mkdir /src_root +mkdir -p /boot + +# Handling of the target root partition +mount $rootfs /tgt_root + +if [ ! -f /run/media/$1/$2 ]; then + mkdir -p /run/media/$1 + mount /dev/$1 /run/media/$1 +fi +mount -o rw,loop,noatime,nodiratime /run/media/$1/$2 /src_root +echo "Copying rootfs files..." +cp -a /src_root/* /tgt_root +if [ -d /tgt_root/etc/ ] ; then + boot_uuid=$(blkid -o value -s UUID ${bootfs}) + swap_part_uuid=$(blkid -o value -s PARTUUID ${swap}) + echo "/dev/disk/by-partuuid/$swap_part_uuid swap swap defaults 0 0" >> /tgt_root/etc/fstab + echo "UUID=$boot_uuid /boot vfat defaults 1 2" >> /tgt_root/etc/fstab + # We dont want udev to mount our root device while we're booting... + if [ -d /tgt_root/etc/udev/ ] ; then + echo "${device}" >> /tgt_root/etc/udev/mount.blacklist + fi +fi + +umount /src_root + +# Handling of the target boot partition +mount $bootfs /boot +echo "Preparing boot partition..." + +EFIDIR="/boot/EFI/BOOT" +mkdir -p $EFIDIR +# Copy the efi loader +cp /run/media/$1/EFI/BOOT/*.efi $EFIDIR + +if [ -f /run/media/$1/EFI/BOOT/grub.cfg ]; then + root_part_uuid=$(blkid -o value -s PARTUUID ${rootfs}) + GRUBCFG="$EFIDIR/grub.cfg" + cp /run/media/$1/EFI/BOOT/grub.cfg $GRUBCFG + # Update grub config for the installed image + # Delete the install entry + sed -i "/menuentry 'install/,/^}/d" $GRUBCFG + # initrd is necessary to boot from MD device + if [ ! "${device#/dev/md}" = "${device}" ]; then + cp /run/media/$1/initrd /boot + cp /run/media/$1/startup.nsh /boot + else + # Delete the initrd lines + sed -i "/initrd /d" $GRUBCFG + fi + # Delete any LABEL= strings + sed -i "s/ LABEL=[^ ]*/ /" $GRUBCFG + # Replace root= and add additional standard boot options + # We use root as a sentinel value, as vmlinuz is no longer guaranteed + sed -i "s/ root=[^ ]*/ root=PARTUUID=$root_part_uuid rw $rootwait quiet /g" $GRUBCFG +fi + +if [ -d /run/media/$1/loader ]; then + rootuuid=$(blkid -o value -s PARTUUID ${rootfs}) + SYSTEMDBOOT_CFGS="/boot/loader/entries/*.conf" + # copy config files for systemd-boot + cp -dr /run/media/$1/loader /boot + # delete the install entry + rm -f /boot/loader/entries/install.conf + # delete the initrd lines + sed -i "/initrd /d" $SYSTEMDBOOT_CFGS + # delete any LABEL= strings + sed -i "s/ LABEL=[^ ]*/ /" $SYSTEMDBOOT_CFGS + # delete any root= strings + sed -i "s/ root=[^ ]*/ /" $SYSTEMDBOOT_CFGS + # add the root= and other standard boot options + sed -i "s@options *@options root=PARTUUID=$rootuuid rw $rootwait quiet @" $SYSTEMDBOOT_CFGS +fi + +umount /tgt_root + +# Copy kernel artifacts. To add more artifacts just add to types +# For now just support kernel types already being used by something in OE-core +for types in bzImage zImage vmlinux vmlinuz fitImage; do + for kernel in `find /run/media/$1/ -name $types*`; do + cp $kernel /boot + done +done + +umount /boot + +sync + +echo "Installation successful. Remove your installation media and press ENTER to reboot." + +read enter + +echo "Rebooting..." +reboot -f diff --git a/meta-oran/recipes-core/initrdscripts/files/init-install.sh b/meta-oran/recipes-core/initrdscripts/files/init-install.sh new file mode 100644 index 0000000..9eae75f --- /dev/null +++ b/meta-oran/recipes-core/initrdscripts/files/init-install.sh @@ -0,0 +1,353 @@ +#!/bin/sh -e +# +# Copyright (C) 2008-2011 Intel +# +# install.sh [device_name] [rootfs_name] [video_mode] [vga_mode] +# + +PATH=/sbin:/bin:/usr/sbin:/usr/bin + +# figure out how big of a boot partition we need +boot_size=$(du -ms /run/media/$1/ | awk '{print $1}') +# remove rootfs.img ($2) from the size if it exists, as its not installed to /boot +if [ -e /run/media/$1/$2 ]; then + boot_size=$(( boot_size - $( du -ms /run/media/$1/$2 | awk '{print $1}') )) +fi +# remove initrd from size since its not currently installed +if [ -e /run/media/$1/initrd ]; then + boot_size=$(( boot_size - $( du -ms /run/media/$1/initrd | awk '{print $1}') )) +fi +# add 10M to provide some extra space for users and account +# for rounding in the above subtractions +boot_size=$(( boot_size + 10 )) + +# 5% for the swap +swap_ratio=5 + +# Get a list of hard drives +hdnamelist="" +live_dev_name=`cat /proc/mounts | grep ${1%/} | awk '{print $1}'` +live_dev_name=${live_dev_name#\/dev/} +# Only strip the digit identifier if the device is not an mmc +case $live_dev_name in + mmcblk*) + ;; + nvme*) + ;; + *) + live_dev_name=${live_dev_name%%[0-9]*} + ;; +esac + +echo "Searching for hard drives ..." + +# Some eMMC devices have special sub devices such as mmcblk0boot0 etc +# we're currently only interested in the root device so pick them wisely +devices=`ls /sys/block/ | grep -v mmcblk` || true +mmc_devices=`ls /sys/block/ | grep "mmcblk[0-9]\{1,\}$"` || true +devices="$devices $mmc_devices" + +for device in $devices; do + case $device in + loop*) + # skip loop device + ;; + sr*) + # skip CDROM device + ;; + ram*) + # skip ram device + ;; + *) + # skip the device LiveOS is on + # Add valid hard drive name to the list + case $device in + $live_dev_name*) + # skip the device we are running from + ;; + *) + hdnamelist="$hdnamelist $device" + ;; + esac + ;; + esac +done + +TARGET_DEVICE_NAME="" +for hdname in $hdnamelist; do + # Display found hard drives and their basic info + echo "-------------------------------" + echo /dev/$hdname + if [ -r /sys/block/$hdname/device/vendor ]; then + echo -n "VENDOR=" + cat /sys/block/$hdname/device/vendor + fi + if [ -r /sys/block/$hdname/device/model ]; then + echo -n "MODEL=" + cat /sys/block/$hdname/device/model + fi + if [ -r /sys/block/$hdname/device/uevent ]; then + echo -n "UEVENT=" + cat /sys/block/$hdname/device/uevent + fi + echo +done + +# Get user choice +while true; do + echo "Please select an install target or press n to exit ($hdnamelist ): " + read answer + if [ "$answer" = "n" ]; then + echo "Installation manually aborted." + exit 1 + fi + for hdname in $hdnamelist; do + if [ "$answer" = "$hdname" ]; then + TARGET_DEVICE_NAME=$answer + break + fi + done + if [ -n "$TARGET_DEVICE_NAME" ]; then + break + fi +done + +if [ -n "$TARGET_DEVICE_NAME" ]; then + echo "Installing image on /dev/$TARGET_DEVICE_NAME ..." +else + echo "No hard drive selected. Installation aborted." + exit 1 +fi + +device=/dev/$TARGET_DEVICE_NAME + +# +# The udev automounter can cause pain here, kill it +# +#rm -f /etc/udev/rules.d/automount.rules +#rm -f /etc/udev/scripts/mount* + +# +# Unmount anything the automounter had mounted +# +#umount ${device}* 2> /dev/null || /bin/true + +for dir in `awk '/\/dev.* \/run\/media/{print $2}' /proc/mounts | grep $TARGET_DEVICE_NAME`; do + umount $dir +done + +if [ ! -b /dev/loop0 ] ; then + mknod /dev/loop0 b 7 0 +fi + +mkdir -p /tmp +if [ ! -L /etc/mtab ] && [ -e /proc/mounts ]; then + ln -sf /proc/mounts /etc/mtab +fi + +disk_size=$(parted ${device} unit mb print | grep '^Disk .*: .*MB' | cut -d" " -f 3 | sed -e "s/MB//") + +grub_version=$(grub-install -V|sed 's/.* \([0-9]\).*/\1/') + +if [ $grub_version -eq 0 ] ; then + bios_boot_size=0 +else + # For GRUB 2 we need separate parition to store stage2 grub image + # 2Mb value is chosen to align partition for best performance. + bios_boot_size=2 +fi + +swap_size=$((disk_size*swap_ratio/100)) +rootfs_size=$((disk_size-bios_boot_size-boot_size-swap_size)) + +boot_start=$((bios_boot_size)) +rootfs_start=$((bios_boot_size+boot_size)) +rootfs_end=$((rootfs_start+rootfs_size)) +swap_start=$((rootfs_end)) + +# MMC devices are special in a couple of ways +# 1) they use a partition prefix character 'p' +# 2) they are detected asynchronously (need rootwait) +rootwait="" +part_prefix="" +if [ ! "${device#/dev/mmcblk}" = "${device}" ] || \ + [ ! "${device#/dev/nvme}" = "${device}" ]; then + part_prefix="p" + rootwait="rootwait" +fi + +# USB devices also require rootwait +if [ -n `readlink /dev/disk/by-id/usb* | grep $TARGET_DEVICE_NAME` ]; then + rootwait="rootwait" +fi + +if [ $grub_version -eq 0 ] ; then + bios_boot='' + bootfs=${device}${part_prefix}1 + rootfs=${device}${part_prefix}2 + swap=${device}${part_prefix}3 +else + bios_boot=${device}${part_prefix}1 + bootfs=${device}${part_prefix}2 + rootfs=${device}${part_prefix}3 + swap=${device}${part_prefix}4 +fi + +echo "*****************" +[ $grub_version -ne 0 ] && echo "BIOS boot partition size: $bios_boot_size MB ($bios_boot)" +echo "Boot partition size: $boot_size MB ($bootfs)" +echo "Rootfs partition size: $rootfs_size MB ($rootfs)" +echo "Swap partition size: $swap_size MB ($swap)" +echo "*****************" +echo "Deleting partition table on ${device} ..." +dd if=/dev/zero of=${device} bs=512 count=35 + +echo "Creating new partition table on ${device} ..." +if [ $grub_version -eq 0 ] ; then + parted ${device} mktable msdos + echo "Creating boot partition on $bootfs" + parted ${device} mkpart primary ext3 0% $boot_size +else + parted ${device} mktable gpt + echo "Creating BIOS boot partition on $bios_boot" + parted ${device} mkpart bios_boot 0% $bios_boot_size + parted ${device} set 1 bios_grub on + echo "Creating boot partition on $bootfs" + parted ${device} mkpart boot ext3 $boot_start $boot_size +fi + +echo "Creating rootfs partition on $rootfs" +[ $grub_version -eq 0 ] && pname='primary' || pname='root' +parted ${device} mkpart $pname ext4 $rootfs_start $rootfs_end + +echo "Creating swap partition on $swap" +[ $grub_version -eq 0 ] && pname='primary' || pname='swap' +parted ${device} mkpart $pname linux-swap $swap_start 100% + +parted ${device} print + +echo "Waiting for device nodes..." +C=0 +while [ $C -ne 3 ] && [ ! -e $bootfs -o ! -e $rootfs -o ! -e $swap ]; do + C=$(( C + 1 )) + sleep 1 +done + +echo "Formatting $bootfs to ext3..." +mkfs.ext3 $bootfs + +echo "Formatting $rootfs to ext4..." +mkfs.ext4 $rootfs + +echo "Formatting swap partition...($swap)" +mkswap $swap + +mkdir /tgt_root +mkdir /src_root +mkdir -p /boot + +# Handling of the target root partition +mount $rootfs /tgt_root + +if [ ! -f /run/media/$1/$2 ]; then + mkdir -p /run/media/$1 + mount /dev/$1 /run/media/$1 +fi +mount -o rw,loop,noatime,nodiratime /run/media/$1/$2 /src_root + +echo "Copying rootfs files..." +cp -a /src_root/* /tgt_root +if [ -d /tgt_root/etc/ ] ; then + if [ $grub_version -ne 0 ] ; then + boot_uuid=$(blkid -o value -s UUID ${bootfs}) + swap_part_uuid=$(blkid -o value -s PARTUUID ${swap}) + bootdev="UUID=$boot_uuid" + swapdev=/dev/disk/by-partuuid/$swap_part_uuid + else + bootdev=${bootfs} + swapdev=${swap} + fi + echo "$swapdev swap swap defaults 0 0" >> /tgt_root/etc/fstab + echo "$bootdev /boot ext3 defaults 1 2" >> /tgt_root/etc/fstab + # We dont want udev to mount our root device while we're booting... + if [ -d /tgt_root/etc/udev/ ] ; then + echo "${device}" >> /tgt_root/etc/udev/mount.blacklist + fi +fi +umount /tgt_root +umount /src_root + +echo "Looking for kernels to use as boot target.." +# Find kernel to boot to +# Give user options if multiple are found +kernels="$(find /run/media/$1/ -type f \ + -name bzImage* -o -name zImage* \ + -o -name vmlinux* -o -name vmlinuz* \ + -o -name fitImage* \ + | sed s:.*/::)" +if [ -n "$(echo $kernels)" ]; then + # only one kernel entry if no space + if [ -z "$(echo $kernels | grep " ")" ]; then + kernel=$kernels + echo "$kernel will be used as the boot target" + else + echo "Which kernel do we want to boot by default? The following kernels were found:" + echo $kernels + read answer + kernel=$answer + fi +else + echo "No kernels found, exiting..." + exit 1 +fi + +# Handling of the target boot partition +mount $bootfs /boot +echo "Preparing boot partition..." + +if [ -f /etc/grub.d/00_header -a $grub_version -ne 0 ] ; then + echo "Preparing custom grub2 menu..." + root_part_uuid=$(blkid -o value -s PARTUUID ${rootfs}) + boot_uuid=$(blkid -o value -s UUID ${bootfs}) + GRUBCFG="/boot/grub/grub.cfg" + mkdir -p $(dirname $GRUBCFG) + cat >$GRUBCFG <<_EOF +timeout=5 +default=0 +menuentry "Linux" { + search --no-floppy --fs-uuid $boot_uuid --set root + linux /$kernel root=PARTUUID=$root_part_uuid $rootwait rw $5 $3 $4 quiet +} +_EOF + chmod 0444 $GRUBCFG +fi +grub-install ${device} + +if [ $grub_version -eq 0 ] ; then + echo "(hd0) ${device}" > /boot/grub/device.map + echo "Preparing custom grub menu..." + echo "default 0" > /boot/grub/menu.lst + echo "timeout 30" >> /boot/grub/menu.lst + echo "title Live Boot/Install-Image" >> /boot/grub/menu.lst + echo "root (hd0,0)" >> /boot/grub/menu.lst + echo "kernel /$kernel root=$rootfs rw $3 $4 quiet" >> /boot/grub/menu.lst +fi + +# Copy kernel artifacts. To add more artifacts just add to types +# For now just support kernel types already being used by something in OE-core +for types in bzImage zImage vmlinux vmlinuz fitImage; do + for kernel in `find /run/media/$1/ -name $types*`; do + cp $kernel /boot + done +done + +umount /boot + +sync + +echo "Remove your installation media, and press ENTER" + +read enter + +echo "Rebooting..." +reboot -f diff --git a/meta-oran/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bbappend b/meta-oran/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bbappend new file mode 100644 index 0000000..1391f74 --- /dev/null +++ b/meta-oran/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bbappend @@ -0,0 +1,5 @@ +# +# Copyright (C) 2019 Wind River Systems, Inc. +# + +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" diff --git a/meta-oran/recipes-core/initrdscripts/initramfs-live-install_1.0.bbappend b/meta-oran/recipes-core/initrdscripts/initramfs-live-install_1.0.bbappend new file mode 100644 index 0000000..1391f74 --- /dev/null +++ b/meta-oran/recipes-core/initrdscripts/initramfs-live-install_1.0.bbappend @@ -0,0 +1,5 @@ +# +# Copyright (C) 2019 Wind River Systems, Inc. +# + +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" diff --git a/meta-oran/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bbappend b/meta-oran/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bbappend new file mode 100644 index 0000000..1391f74 --- /dev/null +++ b/meta-oran/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bbappend @@ -0,0 +1,5 @@ +# +# Copyright (C) 2019 Wind River Systems, Inc. +# + +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" diff --git a/meta-oran/recipes-core/initrdscripts/initramfs-module-install_1.0.bbappend b/meta-oran/recipes-core/initrdscripts/initramfs-module-install_1.0.bbappend new file mode 100644 index 0000000..1391f74 --- /dev/null +++ b/meta-oran/recipes-core/initrdscripts/initramfs-module-install_1.0.bbappend @@ -0,0 +1,5 @@ +# +# Copyright (C) 2019 Wind River Systems, Inc. +# + +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" diff --git a/meta-oran/recipes-core/initrdscripts/initramfs-module-setup-live/setup-live b/meta-oran/recipes-core/initrdscripts/initramfs-module-setup-live/setup-live new file mode 100644 index 0000000..66ff6ac --- /dev/null +++ b/meta-oran/recipes-core/initrdscripts/initramfs-module-setup-live/setup-live @@ -0,0 +1,75 @@ +#/bin/sh +# Copyright (C) 2011 O.S. Systems Software LTDA. +# Licensed on MIT + +_UDEV_DAEMON=`udev_daemon` + +setup_enabled() { + return 0 +} + +setup_run() { +ROOT_IMAGE="rootfs.img" +ISOLINUX="" +ROOT_DISK="" +shelltimeout=60 + + if [ -z "$bootparam_root" -o "$bootparam_root" = "/dev/ram0" ]; then + echo "Waiting for removable media..." + udevadm trigger --action=add + udevadm settle + echo "Mounted filesystems" + mount |grep media + C=0 + while true + do + for i in `ls /run/media 2>/dev/null`; do + if [ -f /run/media/$i/$ROOT_IMAGE ] ; then + found="yes" + ROOT_DISK="$i" + break + elif [ -f /run/media/$i/isolinux/$ROOT_IMAGE ]; then + found="yes" + ISOLINUX="isolinux" + ROOT_DISK="$i" + break + fi + done + if [ "$found" = "yes" ]; then + break; + fi + # don't wait for more than $shelltimeout seconds, if it's set + if [ -n "$shelltimeout" ]; then + echo " " $(( $shelltimeout - $C )) + if [ $C -ge $shelltimeout ]; then + echo "..." + echo "Mounted filesystems" + mount | grep media + echo "Available block devices" + cat /proc/partitions + fatal "Cannot find $ROOT_IMAGE file in /run/media/* , dropping to a shell " + fi + udevadm trigger --action=add + udevadm settle + echo "Mounted filesystems" + mount |grep media + C=$(( C + 1 )) + fi + sleep 1 + done + killall -9 "${_UDEV_DAEMON##*/}" 2>/dev/null + # The existing rootfs module has no support for rootfs images. Assign the rootfs image. + bootparam_root="/run/media/$ROOT_DISK/$ISOLINUX/$ROOT_IMAGE" + fi + + if [ "$bootparam_LABEL" != "boot" -a -f /init.d/$bootparam_LABEL.sh ] ; then + if [ -f /run/media/$ROOT_DISK/$ISOLINUX/$ROOT_IMAGE ] ; then + ./init.d/$bootparam_LABEL.sh $ROOT_DISK/$ISOLINUX $ROOT_IMAGE $video_mode $vga_mode $console_params + else + fatal "Could not find $bootparam_LABEL script" + fi + + # If we're getting here, we failed... + fatal "Target $bootparam_LABEL failed" + fi +} diff --git a/meta-oran/recipes-core/initrdscripts/initramfs-module-setup-live_1.0.bbappend b/meta-oran/recipes-core/initrdscripts/initramfs-module-setup-live_1.0.bbappend new file mode 100644 index 0000000..73f06b8 --- /dev/null +++ b/meta-oran/recipes-core/initrdscripts/initramfs-module-setup-live_1.0.bbappend @@ -0,0 +1,5 @@ +# +# Copyright (C) 2019 Wind River Systems, Inc. +# + +FILESEXTRAPATHS_prepend := "${THISDIR}/initramfs-module-setup-live:"