diff --git a/dracut/vmklive/copy-initramfs.sh b/dracut/vmklive/copy-initramfs.sh deleted file mode 100644 index ccb2178..0000000 --- a/dracut/vmklive/copy-initramfs.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- -# ex: ts=8 sw=4 sts=4 et filetype=sh - -# Copy the initramfs back to the new rootfs for proper shutdown. -KVER=$(uname -r) -if [ -x /usr/bin/systemctl ]; then - cp /run/initramfs/live/boot/initrd $NEWROOT/boot/initramfs-${KVER}.img -fi diff --git a/mklive.sh.in b/mklive.sh.in index 4dfd36a..a4dca79 100644 --- a/mklive.sh.in +++ b/mklive.sh.in @@ -155,13 +155,8 @@ generate_initramfs() { copy_dracut_files "$ROOTFS" copy_autoinstaller_files "$ROOTFS" - if [ "$BASE_SYSTEM_PKG" = "base-system-systemd" ]; then - _args="--add systemd" - else - _args="--omit systemd" - fi chroot "$ROOTFS" env -i /usr/bin/dracut -N --"${INITRAMFS_COMPRESSION}" \ - --add-drivers "ahci" --force-add "vmklive autoinstaller" ${_args} "/boot/initrd" $KERNELVERSION + --add-drivers "ahci" --force-add "vmklive autoinstaller" --omit systemd "/boot/initrd" $KERNELVERSION [ $? -ne 0 ] && die "Failed to generate the initramfs" mv "$ROOTFS"/boot/initrd "$BOOT_DIR"