woopsie, the return ;)

5 files changed, 0 insertions, 98 deletions

diff --git a/remote/modules/dbus/dbus.build b/remote/modules/dbus/dbus.build
deleted file mode 100644
index c5b2d353..00000000
--- a/remote/modules/dbus/dbus.build
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash
-
-fetch_source() {
-	echo "Extracting from running system..."
-}
-
-build() {
-	COPYLIST="list_dpkg_output"
-	[ -e "${COPYLIST}" ] && rm "${COPYLIST}"
-	
-	list_packet_files >> "${COPYLIST}"
-	tarcopy "$(cat "${COPYLIST}" | sort -u)" "${MODULE_BUILD_DIR}"
-	
-	# Generate systemd files
-	mkdir -p "$MODULE_BUILD_DIR/etc/systemd/system"
-	# This is ugly, as the command line arguments changed over time. Try to do the right thing (whatever that is)
-	# Need to run dbus-uuidgen first?
-	local UUIDGEN="# This line intentionally left blank"
-	if files_contain "ExecStartPre.*uuidgen" "/lib/systemd/system/dbus.service" "/usr/lib/systemd/system/dbus.service"; then
-		UUIDGEN=$(find "$MODULE_BUILD_DIR" -name dbus-uuidgen -executable | head -n 1)
-		[ -z "$UUIDGEN" ] && perror "Could not determine dbus-uuidgen location"
-		UUIDGEN="ExecStartPre=/${UUIDGEN#$MODULE_BUILD_DIR} --ensure"
-	fi
-	# Figure out daemon location
-	local DAEMON=$(find "$MODULE_BUILD_DIR" -name dbus-daemon -executable | head -n 1)
-	[ -z "$DAEMON" ] && perror "Could not determine dbus-daemon location"
-	DAEMON="/${DAEMON#$MODULE_BUILD_DIR}"
-	local DAEMON_ARGS=""
-	# Daemon arguments
-	if files_contain "dbus-daemon.*nopidfile" "/lib/systemd/system/dbus.service" "/usr/lib/systemd/system/dbus.service"; then
-		DAEMON_ARGS+=" --nopidfile"
-	fi
-	if files_contain "dbus-daemon.*activation=systemd" "/lib/systemd/system/dbus.service" "/usr/lib/systemd/system/dbus.service"; then
-		DAEMON_ARGS+=" --activation=systemd"
-	fi
-	if files_contain "dbus-daemon.*systemd-activation" "/lib/systemd/system/dbus.service" "/usr/lib/systemd/system/dbus.service"; then
-		DAEMON_ARGS+=" --systemd-activation"
-	fi
-	# dbus-send location
-	local SEND=$(find "$MODULE_BUILD_DIR" -name dbus-send -executable | head -n 1)
-	[ -z "$SEND" ] && perror "Could not determine dbus-send location"
-	SEND="/${SEND#$MODULE_BUILD_DIR}"
-	sed "s,%UUIDGEN%,$UUIDGEN,g;s,%DAEMON%,$DAEMON,g;s,%SEND%,$SEND,g;s,%DAEMON_ARGS%,$DAEMON_ARGS,g" "templates/dbus.service" \
-		> "$MODULE_BUILD_DIR/etc/systemd/system/dbus.service" \
-		|| perror "Could not generate $MODULE_BUILD_DIR/etc/systemd/system/dbus.service"
-}
-
-post_copy() {
-	:
-}
-
-files_contain () {
-	[ $# -lt 2 ] && perror "files_contain needs at least 2 arguments (pattern, file)"
-	local PATTERN="$1"
-	shift
-	local FILE
-	for FILE in $@; do
-		[ -e "$FILE" ] || continue
-		grep -q "$PATTERN" "$FILE" && return 0 # Found
-	done
-	return 1
-}
-
diff --git a/remote/modules/dbus/dbus.conf b/remote/modules/dbus/dbus.conf
deleted file mode 100644
index 40f8a53d..00000000
--- a/remote/modules/dbus/dbus.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-REQUIRED_BINARIES="	
-	dbus-cleanup-sockets
-	dbus-daemon
-	dbus-uuidgen
-	dbus-monitor
-	dbus-send
-	dbus-daemon-launch-helper
- "
-REQUIRED_DIRECTORIES="
-	/etc/dbus-1
-"
-REQUIRED_FILES="
-	/etc/systemd/system/dbus.service
-"
-
diff --git a/remote/modules/dbus/dbus.conf.debian b/remote/modules/dbus/dbus.conf.debian
deleted file mode 100644
index d007c2ef..00000000
--- a/remote/modules/dbus/dbus.conf.debian
+++ /dev/null
@@ -1,9 +0,0 @@
-REQUIRED_CONTENT_PACKAGES="
-			dbus
-"
-REQUIRED_DIRECTORIES+="		
-			/lib/systemd
-"
-REQUIRED_FILES="	
-			/etc/default/dbus
-"
diff --git a/remote/modules/dbus/dbus.conf.opensuse b/remote/modules/dbus/dbus.conf.opensuse
deleted file mode 100644
index 9bc514e2..00000000
--- a/remote/modules/dbus/dbus.conf.opensuse
+++ /dev/null
@@ -1,4 +0,0 @@
-REQUIRED_CONTENT_PACKAGES="
-			dbus-1
-"
-
diff --git a/remote/modules/dbus/dbus.conf.ubuntu b/remote/modules/dbus/dbus.conf.ubuntu
deleted file mode 100644
index 558eea7f..00000000
--- a/remote/modules/dbus/dbus.conf.ubuntu
+++ /dev/null
@@ -1,7 +0,0 @@
-REQUIRED_CONTENT_PACKAGES="
-			dbus
-"
-REQUIRED_FILES+="
-			/etc/default/dbus
-"
-