diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2017-02-08 22:28:39 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2017-02-08 22:28:39 +0100 |
| commit | 41581c7b3339ec84d88407435952448bd9c7e256 (patch) | |
| tree | 4918c9823e9cdc0d1a7bacca3b23fa27e75f2d6a | |
| parent | e2874f13978cb7d722dfdcc412638731de52baf9 (diff) | |
| download | imagefish-41581c7b3339ec84d88407435952448bd9c7e256.tar.gz | |
pi tweaks
| -rwxr-xr-x | scripts/tar-to-image.sh | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/scripts/tar-to-image.sh b/scripts/tar-to-image.sh index f0339e7..f099f9c 100755 --- a/scripts/tar-to-image.sh +++ b/scripts/tar-to-image.sh @@ -238,23 +238,38 @@ function fish_firmware_rpi32() { fish cp /usr/share/uboot/rpi_3_32b/u-boot.bin /boot/fw/rpi3-u-boot.bin } -function fish_extlinux_rpi32() { - msg "create extlinux.conf" +function fish_firmware_rpi64() { + msg "rpi 64bit firmware setup" + fish glob cp-a "/usr/share/bcm283x-firmware/*" /boot/fw + fish cp /usr/share/uboot/rpi_3/u-boot.bin /boot/fw/rpi3-u-boot.bin +} + +function fish_extlinux_rpi() { + local cmdline="ro root=LABEL=root console=ttyAMA0,115200 console=tty1" + + msg "boot setup" kver=$(guestfish --remote -- ls /boot \ | grep -e "^vmlinuz-" | grep -v rescue \ | sed -e "s/vmlinuz-//") echo "### kernel version is $kver" + echo "### add /boot/cmdline.txt (for kraxel kernel-main)" + fish write /boot/cmdline.txt "$cmdline" + + echo "### creating extlinux.conf" cat <<-EOF >> "$WORK/extlinux.conf" menu title Fedora boot menu timeout 30 label Fedora (${kver}) kernel /vmlinuz-${kver} - append ro root=LABEL=root console=ttyAMA0,115200 console=tty1 + append ${cmdline} fdtdir /dtb-${kver}/ initrd /initramfs-${kver}.img EOF fish copy-in "$WORK/extlinux.conf" /boot/extlinux + + echo "### rebuilding initramfs" + fish command "dracut --force /boot/initramfs-${kver}.img ${kver}" } ###################################################################### @@ -279,12 +294,14 @@ rpi32) fish_part_rpi fish_copy_tar fish_firmware_rpi32 - fish_extlinux_rpi32 + fish_extlinux_rpi ;; rpi64) fish_init fish_part_rpi fish_copy_tar + fish_firmware_rpi64 + fish_extlinux_rpi ;; *) # should not happen |