Update spec dependecies and dracut module dependencies

Signed-off-by: David Cassany <[email protected]>

.obs/specfile/elemental-toolkit/elemental-toolkit.spec

@@ -31,7 +31,7 @@ Source:         %{name}.tar.xz
 Requires:       dosfstools
 Requires:       e2fsprogs
 # for blkdeactivate
-Requires: lvm2
+Requires:       lvm2
 Requires:       parted
 Requires:       rsync
 Requires:       udev
@@ -42,6 +42,10 @@ Requires:       xorriso >= 1.5
 Requires:       mtools
 Requires:       util-linux
 Requires:       gptfdisk
+Requires:       dracut
+Requires:       grub2-common
+Requires:       squashfs
+Requires:       util-linux-systemd
 
 %if 0%{?suse_version}
 BuildRequires:  golang(API) >= 1.22

pkg/features/embedded/elemental-rootfs/usr/lib/dracut/modules.d/30elemental-rootfs/module-setup.sh

@@ -24,15 +24,10 @@ install() {
     declare systemdsystemunitdir=${systemdsystemunitdir}
 
     inst_multiple \
-        mount mountpoint sort rmdir findmnt rsync cut realpath basename lsblk
+        mount cut basename lsblk elemental
 
     inst_simple "/etc/elemental/config.yaml"
 
-    # Include utilities required for elemental-setup services,
-    # probably a devoted dracut module makes sense
-    inst_multiple -o \
-        "$systemdutildir"/systemd-fsck systemd-analyze partprobe sync udevadm parted mkfs.ext2 mkfs.ext3 mkfs.ext4 mkfs.vfat mkfs.fat mkfs.xfs blkid e2fsck resize2fs mount xfs_growfs umount sgdisk elemental
-
     inst_simple "/etc/systemd/system/elemental-rootfs.service" \
         "${systemdsystemunitdir}/elemental-rootfs.service"
     mkdir -p "${initdir}/${systemdsystemunitdir}/initrd-fs.target.wants"

pkg/features/embedded/elemental-setup/usr/lib/dracut/modules.d/10elemental-setup/module-setup.sh

@@ -18,8 +18,12 @@ install() {
     declare systemdutildir=${systemdutildir}
     declare systemdsystemunitdir=${systemdsystemunitdir}
 
+    inst_multiple \
+        ln mkdir mount umount elemental
+
     inst_multiple -o \
-        ln mkdir mount umount partx elemental systemd-escape
+        systemd-analyze partprobe sync udevadm parted mkfs.ext2 mkfs.ext3 mkfs.ext4 mkfs.vfat \
+	mkfs.fat mkfs.xfs blkid resize2fs mount xfs_growfs umount sgdisk partx mkfs.btrfs btrfs
 
     inst_script "${moddir}/oem-generator.sh" \
         "${systemdutildir}/system-generators/dracut-elemental-oem-generator"

pkg/features/embedded/elemental-sysroot/usr/lib/dracut/modules.d/20elemental-sysroot/module-setup.sh

@@ -32,5 +32,3 @@ install() {
 
     dracut_need_initqueue
 }
-
-