Skip to content
This repository has been archived by the owner on Aug 25, 2021. It is now read-only.

Commit

Permalink
dracut/30ignition: general hack cleanups
Browse files Browse the repository at this point in the history
We're past the MVP phase now. Let's reflect that in our codebase by
dropping all the telltale signs of quick hacks and experimentations.
This makes the tree nicer to hack on as well.

Remember, all your code are belong to Git. We can always revive things
as needed as we get around to supporting Packet/DO, etc... Though those
units will need to be tweaked anyway.

Closes: #33
  • Loading branch information
jlebon committed Feb 27, 2019
1 parent 2c69925 commit 52460d9
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 107 deletions.
10 changes: 0 additions & 10 deletions dracut/30ignition/coreos-digitalocean-network.service

This file was deleted.

13 changes: 0 additions & 13 deletions dracut/30ignition/coreos-static-network.service

This file was deleted.

19 changes: 0 additions & 19 deletions dracut/30ignition/ignition-generator
Original file line number Diff line number Diff line change
Expand Up @@ -39,21 +39,6 @@ if $(cmdline_bool 'ignition.firstboot' 0); then
add_requires ignition-disks.service
add_requires ignition-files.service
add_requires ignition-ask-var-mount.service
#if [[ $(cmdline_arg coreos.oem.id) == "packet" ]]; then
# add_requires coreos-static-network.service
#fi

# On EC2, shut down systemd-networkd if ignition fails so that the instance
# fails EC2 instance checks.
#if [[ $(cmdline_arg coreos.oem.id) == "ec2" ]]; then
# mkdir -p ${UNIT_DIR}/systemd-networkd.service.d
# cat > ${UNIT_DIR}/systemd-networkd.service.d/10-conflict-emergency.conf <<EOF
#[Unit]
#Conflicts=emergency.target
#Conflicts=emergency.service
#Conflicts=dracut-emergency.service
#EOF
#fi
fi

# Write ignition-setup.service customized for PXE/ISO or regular boot
Expand Down Expand Up @@ -86,10 +71,6 @@ if [ -n "$RANDOMIZE_DISK_GUID" ]; then
add_requires "disk-uuid@${escaped_guid}.service"
fi

if [[ $(cmdline_arg coreos.oem.id) == "digitalocean" ]]; then
add_requires coreos-digitalocean-network.service
fi

oem_id=pxe
if [[ $(systemd-detect-virt || true) =~ ^(kvm|qemu)$ ]]; then
oem_id=qemu
Expand Down
12 changes: 0 additions & 12 deletions dracut/30ignition/module-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ install() {
inst_script "$moddir/ignition-setup.sh" \
"/usr/sbin/ignition-setup"

# inst_script "$moddir/retry-umount.sh" \
# "/usr/sbin/retry-umount"

inst_simple "$moddir/ignition-generator" \
"$systemdutildir/system-generators/ignition-generator"

Expand All @@ -46,15 +43,6 @@ install() {

inst_simple "$moddir/ignition-remount-sysroot.service" \
"$systemdutildir/system/ignition-remount-sysroot.service"

# inst_simple "$moddir/sysroot-boot.service" \
# "$systemdsystemunitdir/sysroot-boot.service"

# inst_simple "$moddir/coreos-digitalocean-network.service" \
# "$systemdsystemunitdir/coreos-digitalocean-network.service"

# inst_simple "$moddir/coreos-static-network.service" \
# "$systemdsystemunitdir/coreos-static-network.service"
}

has_builtin_fw_cfg() {
Expand Down
32 changes: 0 additions & 32 deletions dracut/30ignition/retry-umount.sh

This file was deleted.

21 changes: 0 additions & 21 deletions dracut/30ignition/sysroot-boot.service

This file was deleted.

0 comments on commit 52460d9

Please sign in to comment.