Browse Source

Remove defunct systemd support

Closes: #70 [via git-merge-pr]
Cameron Nemo 6 years ago
parent
commit
53b58fef3f
2 changed files with 1 additions and 15 deletions
  1. 0 9
      dracut/vmklive/copy-initramfs.sh
  2. 1 6
      mklive.sh.in

+ 0 - 9
dracut/vmklive/copy-initramfs.sh

@@ -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

+ 1 - 6
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"