Skip to content

Commit

Permalink
dracut: remove CoreOS specific modules
Browse files Browse the repository at this point in the history
The CoreOS specific modules have been moved to
https://github.com/coreos/fedora-coreos-config.
  • Loading branch information
Ben Howard committed Jul 23, 2020
1 parent 629fc6d commit 6a5575c
Show file tree
Hide file tree
Showing 13 changed files with 1 addition and 469 deletions.
34 changes: 0 additions & 34 deletions dracut/30ignition/coreos-gpt-setup.service

This file was deleted.

25 changes: 0 additions & 25 deletions dracut/30ignition/coreos-gpt-setup.sh

This file was deleted.

38 changes: 0 additions & 38 deletions dracut/30ignition/coreos-teardown-initramfs.service

This file was deleted.

187 changes: 0 additions & 187 deletions dracut/30ignition/coreos-teardown-initramfs.sh

This file was deleted.

2 changes: 0 additions & 2 deletions dracut/30ignition/ignition-generator
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@ if $(cmdline_bool 'ignition.firstboot' 0); then
[Unit]
Requires=dev-disk-by\x2dlabel-boot.device
After=dev-disk-by\x2dlabel-boot.device
Requires=coreos-gpt-setup.service
After=coreos-gpt-setup.service
EOF
fi
else
Expand Down
2 changes: 1 addition & 1 deletion dracut/30ignition/ignition-setup-user.service
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Before=ignition-fetch-offline.service
Before=multipathd.service

# On diskful boots, ignition-generator adds Requires/After on
# dev-disk-by\x2dlabel-boot.device & coreos-gpt-setup.service
# dev-disk-by\x2dlabel-boot.device

[Service]
Type=oneshot
Expand Down
10 changes: 0 additions & 10 deletions dracut/30ignition/module-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,6 @@ install() {
# Required on system using SELinux
inst_multiple -o setfiles

inst_script "$moddir/coreos-gpt-setup.sh" \
"/usr/sbin/coreos-gpt-setup"

inst_script "$moddir/ignition-setup-base.sh" \
"/usr/sbin/ignition-setup-base"
inst_script "$moddir/ignition-setup-user.sh" \
Expand All @@ -83,12 +80,6 @@ install() {
"$systemdsystemunitdir/ignition-$x.target"
done

# For consistency tear down the network and persist multipath between the initramfs and
# real root. See https://github.com/coreos/fedora-coreos-tracker/issues/394#issuecomment-599721763
inst_script "$moddir/coreos-teardown-initramfs.sh" \
"/usr/sbin/coreos-teardown-initramfs"
install_ignition_unit coreos-teardown-initramfs.service

install_ignition_unit ignition-setup-base.service
install_ignition_unit ignition-setup-user.service
install_ignition_unit ignition-fetch.service
Expand All @@ -99,7 +90,6 @@ install() {

# units only started when we have a boot disk
# path generated by systemd-escape --path /dev/disk/by-label/root
install_ignition_unit coreos-gpt-setup.service ignition-diskful.target
install_ignition_unit ignition-remount-sysroot.service ignition-diskful.target

# needed for openstack config drive support
Expand Down
15 changes: 0 additions & 15 deletions dracut/99emergency-timeout/ignition-virtio-dump-journal.service

This file was deleted.

11 changes: 0 additions & 11 deletions dracut/99emergency-timeout/ignition-virtio-dump-journal.sh

This file was deleted.

23 changes: 0 additions & 23 deletions dracut/99emergency-timeout/module-setup.sh

This file was deleted.

0 comments on commit 6a5575c

Please sign in to comment.