root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-19 19:40:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

rename initramfs to initrd

Browse source
This commit is contained in:
Tobias Powalowski 2023-07-03 07:44:21 +02:00
parent 322d3bba13
commit 82e891edd3
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
usr/lib/archboot/iso.sh
View file

@ -53,7 +53,7 @@ _config() {
# - unified EFI is not possible because of this:
# https://sourceware.org/bugzilla/show_bug.cgi?id=29009
# - only left option is extlinux support in u-boot loader
_prepare_kernel_initramfs_files() {
_prepare_kernel_initrd_files() {
#shellcheck disable=SC1090
source "${_PRESET}"
mkdir -p "${_ISODIR}"/EFI/{BOOT,TOOLS}
@ -77,9 +77,9 @@ _prepare_kernel_initramfs_files() {
cp "${_ISODIR}/boot/init-${_ARCH}.img" ./
fi
fi
echo "Running archboot-cpio.sh for initramfs-${_ARCH}.img..."
echo "Running archboot-cpio.sh for initrd-${_ARCH}.img..."
#shellcheck disable=SC2154
archboot-cpio.sh -c "${MKINITCPIO_CONFIG}" -k "${ALL_kver}" -g "${_ISODIR}/boot/initramfs-${_ARCH}.img" || exit 1
archboot-cpio.sh -c "${MKINITCPIO_CONFIG}" -k "${ALL_kver}" -g "${_ISODIR}/boot/initrd-${_ARCH}.img" || exit 1
# delete cachedir on archboot environment
if grep -qw 'archboot' /etc/hostname; then
if [[ -d "${_CACHEDIR}" ]]; then

4
usr/lib/archboot/run/iso.sh
View file

@ -12,7 +12,7 @@ _config
if echo "${_BASENAME}" | grep -qw aarch64 || echo "${_BASENAME}" | grep -qw x86_64; then
# running system = aarch64 or x86_64
echo "Starting ISO creation..."
_prepare_kernel_initramfs_files || exit 1
_prepare_kernel_initrd_files || exit 1
_prepare_ucode || exit 1
if echo "${_BASENAME}" | grep -qw aarch64; then
_prepare_fedora_shim_bootloaders_aarch64 || exit 1
@ -35,7 +35,7 @@ if echo "${_BASENAME}" | grep -qw aarch64 || echo "${_BASENAME}" | grep -qw x86_
else
# running system = riscv64
echo "Starting Image creation..."
_prepare_kernel_initramfs_files || exit 1
_prepare_kernel_initrd_files || exit 1
_prepare_extlinux_conf || exit 1
_reproducibility
_uboot || exit 1

12
usr/share/archboot/base/init
View file

@ -53,7 +53,7 @@ while true; do
_COUNT=$((_COUNT+1))
[[ "${_COUNT}" == 10 ]] && break
done
if ! [[ -f "/mnt/boot/initramfs-$(uname -m).img" ]] ; then
if ! [[ -f "/mnt/boot/initrd-$(uname -m).img" ]] ; then
if ! mount /cdrom/efi.img /mnt &>/dev/null; then
echo -e "\e[1;91mError: Didn't find a device with archboot rootfs! \e[m"
echo -e "\e[1mThis needs further debugging. Please contact the archboot author.\e[m"
@ -63,10 +63,10 @@ if ! [[ -f "/mnt/boot/initramfs-$(uname -m).img" ]] ; then
fi
fi
cd /
# move in modules from main initramfs
echo -e "\e[1mStep 2/7:\e[m Copying and loading modules from initramfs-$(uname -m).img..."
# move in modules from main initrd
echo -e "\e[1mStep 2/7:\e[m Copying and loading modules from initrd-$(uname -m).img..."
echo -e " This may need some time..."
bsdcpio -u -i "*/lib/modules/" "*/lib/firmware/" <"/mnt/boot/initramfs-$(uname -m).img" &>/dev/null || _emergency_shell
bsdcpio -u -i "*/lib/modules/" "*/lib/firmware/" <"/mnt/boot/initrd-$(uname -m).img" &>/dev/null || _emergency_shell
# reinitialize available modules
udevadm control -R
# clear screen
@ -85,7 +85,7 @@ setfont consolefont-${SIZE}.psf.gz -C /dev/console
_title
echo -e "\e[1mStep 1/7:\e[m Searching for archboot rootfs on usb/hd/cdrom device..."
echo -e " Trying for 10 seconds /dev/sr0 and UUID=1234-ABCD..."
echo -e "\e[1mStep 2/7:\e[m Copying and loading modules from initramfs-$(uname -m).img..."
echo -e "\e[1mStep 2/7:\e[m Copying and loading modules from initrd-$(uname -m).img..."
echo -e " This may need some time..."
echo -e "\e[1mStep 3/7:\e[m Removing firmware and modules..."
# keep ethernet NIC firmware
@ -105,7 +105,7 @@ mkdir -p /sysroot/usr/lib
mv /lib/modules /sysroot/usr/lib
mv /lib/firmware /sysroot/usr/lib
cd /sysroot || _emergency_shell
bsdcpio -u -f "*/lib/modules/" -f "*/lib/firmware/" -i <"/mnt/boot/initramfs-$(uname -m).img" &>/dev/null || _emergency_shell
bsdcpio -u -f "*/lib/modules/" -f "*/lib/firmware/" -i <"/mnt/boot/initrd-$(uname -m).img" &>/dev/null || _emergency_shell
# unmount everything after copying
echo -e "\e[1mStep 7/7:\e[m Unmounting archboot rootfs..."
while true; do