7 files changed, 0 insertions, 220 deletions
diff --git a/systemd/cloud-config.service b/systemd/cloud-config.service
deleted file mode 100644
index 3309e08a..00000000
--- a/systemd/cloud-config.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Apply the settings specified in cloud-config
-After=network-online.target cloud-config.target
-Wants=network-online.target cloud-config.target
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/cloud-init modules --mode=config
-RemainAfterExit=yes
-TimeoutSec=0
-
-# Output needs to appear in instance console output
-StandardOutput=journal+console
-
-[Install]
-WantedBy=cloud-init.target
diff --git a/systemd/cloud-config.target b/systemd/cloud-config.target
deleted file mode 100644
index ae9b7d02..00000000
--- a/systemd/cloud-config.target
+++ /dev/null
@@ -1,11 +0,0 @@
-# cloud-init normally emits a "cloud-config" upstart event to inform third
-# parties that cloud-config is available, which does us no good when we're
-# using systemd.  cloud-config.target serves as this synchronization point
-# instead.  Services that would "start on cloud-config" with upstart can
-# instead use "After=cloud-config.target" and "Wants=cloud-config.target"
-# as appropriate.
-
-[Unit]
-Description=Cloud-config availability
-Wants=cloud-init-local.service cloud-init.service
-After=cloud-init-local.service cloud-init.service
diff --git a/systemd/cloud-final.service b/systemd/cloud-final.service
deleted file mode 100644
index 3927710f..00000000
--- a/systemd/cloud-final.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=Execute cloud user/final scripts
-After=network-online.target cloud-config.service rc-local.service
-Wants=network-online.target cloud-config.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/cloud-init modules --mode=final
-RemainAfterExit=yes
-TimeoutSec=0
-KillMode=process
-
-# Output needs to appear in instance console output
-StandardOutput=journal+console
-
-[Install]
-WantedBy=cloud-init.target
diff --git a/systemd/cloud-init-generator b/systemd/cloud-init-generator
deleted file mode 100755
index 2d319695..00000000
--- a/systemd/cloud-init-generator
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/bin/sh
-set -f
-
-LOG=""
-DEBUG_LEVEL=1
-LOG_D="/run/cloud-init"
-ENABLE="enabled"
-DISABLE="disabled"
-CLOUD_SYSTEM_TARGET="/lib/systemd/system/cloud-init.target"
-CLOUD_TARGET_NAME="cloud-init.target"
-# lxc sets 'container', but lets make that explicitly a global
-CONTAINER="${container}"
-
-debug() {
-    local lvl="$1"
-    shift
-    [ "$lvl" -gt "$DEBUG_LEVEL" ] && return
-    if [ -z "$LOG" ]; then
-        local log="$LOG_D/${0##*/}.log"
-        { [ -d "$LOG_D" ] || mkdir -p "$LOG_D"; } &&
-            { : > "$log"; } >/dev/null 2>&1 && LOG="$log" ||
-            LOG="/dev/kmsg"
-    fi
-    echo "$@" >> "$LOG"
-}
-
-etc_file() {
-    local pprefix="${1:-/etc/cloud/cloud-init.}"
-    _RET="unset"
-    [ -f "${pprefix}$ENABLE" ] && _RET="$ENABLE" && return 0
-    [ -f "${pprefix}$DISABLE" ] && _RET="$DISABLE" && return 0
-    return 0
-}
-
-read_proc_cmdline() {
-    # return /proc/cmdline for non-container, and /proc/1/cmdline for container
-    local ctname="systemd"
-    if [ -n "$CONTAINER" ] && ctname=$CONTAINER ||
-        systemd-detect-virt --container --quiet; then
-        if { _RET=$(tr '\0' ' ' < /proc/1/cmdline); } 2>/dev/null; then
-            _RET_MSG="container[$ctname]: pid 1 cmdline"
-            return
-        fi
-        _RET=""
-        _RET_MSG="container[$ctname]: pid 1 cmdline not available"
-        return 0
-    fi
-
-    _RET_MSG="/proc/cmdline"
-    read _RET < /proc/cmdline
-}
-
-kernel_cmdline() {
-    local cmdline="" tok=""
-    if [ -n "${KERNEL_CMDLINE+x}" ]; then
-        # use KERNEL_CMDLINE if present in environment even if empty
-        cmdline=${KERNEL_CMDLINE}
-        debug 1 "kernel command line from env KERNEL_CMDLINE: $cmdline"
-    elif read_proc_cmdline; then
-        read_proc_cmdline && cmdline="$_RET"
-        debug 1 "kernel command line ($_RET_MSG): $cmdline"
-    fi
-    _RET="unset"
-    cmdline=" $cmdline "
-    tok=${cmdline##* cloud-init=}
-    [ "$tok" = "$cmdline" ] && _RET="unset"
-    tok=${tok%% *}
-    [ "$tok" = "$ENABLE" -o "$tok" = "$DISABLE" ] && _RET="$tok"
-    return 0
-}
-
-default() {
-    _RET="$ENABLE"
-}
-
-main() {
-    local normal_d="$1" early_d="$2" late_d="$3"
-    local target_name="multi-user.target" gen_d="$early_d"
-    local link_path="$gen_d/${target_name}.wants/${CLOUD_TARGET_NAME}"
-
-    debug 1 "$0 normal=$normal_d early=$early_d late=$late_d"
-    debug 2 "$0 $*"
-
-    local search result="error" ret=""
-    for search in kernel_cmdline etc_file default; do
-        if $search; then
-            debug 1 "$search found $_RET"
-            [ "$_RET" = "$ENABLE" -o "$_RET" = "$DISABLE" ] &&
-                result=$_RET && break
-        else
-            ret=$?
-            debug 0 "search $search returned $ret"
-        fi
-    done
-    
-    if [ "$result" = "$ENABLE" ]; then
-        if [ -e "$link_path" ]; then
-                debug 1 "already enabled: no change needed"
-        else
-            [ -d "${link_path%/*}" ] || mkdir -p "${link_path%/*}" ||
-                debug 0 "failed to make dir $link_path"
-            if ln -snf "$CLOUD_SYSTEM_TARGET" "$link_path"; then
-                debug 1 "enabled via $link_path -> $CLOUD_SYSTEM_TARGET"
-            else
-                ret=$?
-                debug 0 "[$ret] enable failed:" \
-                    "ln $CLOUD_SYSTEM_TARGET $link_path"
-            fi
-        fi
-    elif [ "$result" = "$DISABLE" ]; then
-        if [ -f "$link_path" ]; then
-            if rm -f "$link_path"; then
-                debug 1 "disabled. removed existing $link_path"
-            else
-                ret=$?
-                debug 0 "[$ret] disable failed, remove $link_path"
-            fi
-        else
-            debug 1 "already disabled: no change needed [no $link_path]"
-        fi
-    else
-        debug 0 "unexpected result '$result'"
-        ret=3
-    fi
-    return $ret
-}
-
-main "$@"
-
-# vi: ts=4 expandtab
diff --git a/systemd/cloud-init-local.service b/systemd/cloud-init-local.service
deleted file mode 100644
index b19eeaee..00000000
--- a/systemd/cloud-init-local.service
+++ /dev/null
@@ -1,22 +0,0 @@
-[Unit]
-Description=Initial cloud-init job (pre-networking)
-DefaultDependencies=no
-Wants=local-fs.target
-Wants=network-pre.target
-After=local-fs.target
-Conflicts=shutdown.target
-Before=network-pre.target
-Before=shutdown.target
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/cloud-init init --local
-ExecStart=/bin/touch /run/cloud-init/network-config-ready
-RemainAfterExit=yes
-TimeoutSec=0
-
-# Output needs to appear in instance console output
-StandardOutput=journal+console
-
-[Install]
-WantedBy=cloud-init.target
diff --git a/systemd/cloud-init.service b/systemd/cloud-init.service
deleted file mode 100644
index 6fb655e6..00000000
--- a/systemd/cloud-init.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=Initial cloud-init job (metadata service crawler)
-After=cloud-init-local.service networking.service
-Before=network-online.target sshd.service sshd-keygen.service systemd-user-sessions.service
-Requires=networking.service
-Wants=local-fs.target cloud-init-local.service sshd.service sshd-keygen.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/cloud-init init
-RemainAfterExit=yes
-TimeoutSec=0
-
-# Output needs to appear in instance console output
-StandardOutput=journal+console
-
-[Install]
-WantedBy=cloud-init.target
diff --git a/systemd/cloud-init.target b/systemd/cloud-init.target
deleted file mode 100644
index a63babb0..00000000
--- a/systemd/cloud-init.target
+++ /dev/null
@@ -1,6 +0,0 @@
-# cloud-init target is enabled by cloud-init-generator
-# To disable it you can either:
-#  a.) boot with kernel cmdline of 'cloudinit=disabled'
-#  b.) touch a file /etc/cloud/cloud-init.disabled
-[Unit]
-Description=Cloud-init target