From d121a4085e8f6780faeb15228e1c284f8c0f4ba3 Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Sun, 12 Feb 2023 16:07:59 +0100 Subject: [PATCH] remove mkdir --- usr/lib/initcpio/install/archboot_init | 4 ++-- usr/share/archboot/base/init | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/usr/lib/initcpio/install/archboot_init b/usr/lib/initcpio/install/archboot_init index 4ff896e8d..aacc06408 100644 --- a/usr/lib/initcpio/install/archboot_init +++ b/usr/lib/initcpio/install/archboot_init @@ -12,13 +12,13 @@ build() { '/drivers/spi/' 'virtio' map add_binary bash sh blkid mount switch_root bsdcpio mkfs.btrfs setfont \ /usr/lib/systemd/systemd-udevd udevadm systemd-tmpfiles kmod insmod modprobe \ - mkdir gzip uname cat cp dmesg grep ln ls mv rm umount lsblk rmmod + gzip uname cat cp dmesg grep ln ls mv rm umount lsblk rmmod add_file "/usr/share/kbd/consolefonts/ter-v16n.psf.gz" "/consolefont.psf.gz" map add_udev_rule '50-udev-default.rules' '60-persistent-storage.rules' \ '64-btrfs.rules' '80-drivers.rules' map add_file '/usr/lib/udev/ata_id' '/usr/lib/udev/scsi_id' add_file "/usr/share/archboot/base/init" "/init" - map add_dir /mnt /etc/modprobe.d + map add_dir /mnt /etc/modprobe.d /cdrom add_file /usr/share/archboot/base/etc/modprobe.d/modprobe.conf /etc/modprobe.d/modprobe.conf } diff --git a/usr/share/archboot/base/init b/usr/share/archboot/base/init index ccb4406c6..e1953b81d 100755 --- a/usr/share/archboot/base/init +++ b/usr/share/archboot/base/init @@ -50,7 +50,6 @@ while ! mount UUID=1234-ABCD /mnt &>/dev/null; do done if ! [[ -f "/mnt/boot/initramfs-$(uname -m).img" ]] ; then echo -e "\e[1mStep 3/4:\e[m Searching for archboot rootfs on cdrom device..." - mkdir /cdrom mount /dev/sr0 /cdrom &>/dev/null if ! mount /cdrom/efi.img /mnt &>/dev/null; then echo -e "\e[1;91mError: Didn't find a device with archboot rootfs\!\e[m"