mollusk/void-mklive
mollusk/void-mklive
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove defunct systemd support

Browse Source 
Closes: #70 [via git-merge-pr]
This commit is contained in:
Cameron Nemo 2019-05-19 18:21:56 -07:00 committed by Michael Aldridge
parent aa50f22312
commit 53b58fef3f
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dracut/vmklive/copy-initramfs.sh
View File

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

7
mklive.sh.in
View File

@ -155,13 +155,8 @@ generate_initramfs() {
copy_dracut_files "$ROOTFS" copy_dracut_files "$ROOTFS"
copy_autoinstaller_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}" \ 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" [ $? -ne 0 ] && die "Failed to generate the initramfs"
mv "$ROOTFS"/boot/initrd "$BOOT_DIR" mv "$ROOTFS"/boot/initrd "$BOOT_DIR"