From 772a98fec669cf881d7c1ea17631bc8560bccf5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Mon, 10 Nov 2014 16:26:43 +0000
Subject: Remove unnecessary stuff to configure network/ntpd

This is done now by systemd

Reviewed-by: Sam Thursfield <sam.thursfield@codethink.co.uk>
Reviewed-by: James Thomas <james.thomas@codethink.co.uk>
---
 scripts/run-ntpd-with-config       | 23 -----------------------
 systemd-units/crond.service.in     |  6 ------
 systemd-units/ifup@.service.in     |  9 ---------
 systemd-units/ntpd-boot.service.in | 10 ----------
 systemd-units/ntpd.service.in      | 10 ----------
 udev-rules/100-baserock.rules      |  5 -----
 6 files changed, 63 deletions(-)
 delete mode 100755 scripts/run-ntpd-with-config
 delete mode 100644 systemd-units/crond.service.in
 delete mode 100644 systemd-units/ifup@.service.in
 delete mode 100644 systemd-units/ntpd-boot.service.in
 delete mode 100644 systemd-units/ntpd.service.in
 delete mode 100644 udev-rules/100-baserock.rules

diff --git a/scripts/run-ntpd-with-config b/scripts/run-ntpd-with-config
deleted file mode 100755
index 24d9cc165..000000000
--- a/scripts/run-ntpd-with-config
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-#
-# Invoke the Busybox ntpd with servers listed in /etc/ntpd.conf, if it
-# exists. The servers should be listed one per line, with the first
-# word in the line being "server". Any lines that don't start with
-# "server" as the first word are ignored. The server name should be
-# the second word. Anything else on the line is ignored.
-#
-# If the config file does not exist, no default servers are used.
-
-set -eu
-
-parse_servers()
-{
-    awk '$1 == "server" { for (i=2; i <= NF; ++i) print "-p", $i }' "$1"
-}
-
-if [ -e /etc/ntpd.conf ]
-then
-    exec ntpd $(parse_servers /etc/ntpd.conf) "$@"
-else
-    exec ntpd "$@"
-fi
diff --git a/systemd-units/crond.service.in b/systemd-units/crond.service.in
deleted file mode 100644
index 224c33c09..000000000
--- a/systemd-units/crond.service.in
+++ /dev/null
@@ -1,6 +0,0 @@
-[Unit]
-Description=Cron Service
-
-[Service]
-ExecStart=/usr/sbin/crond -f
-Restart=always
diff --git a/systemd-units/ifup@.service.in b/systemd-units/ifup@.service.in
deleted file mode 100644
index 25e8dc151..000000000
--- a/systemd-units/ifup@.service.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=ifup for %I
-Before=network.target
-
-[Service]
-Type=oneshot
-ExecStart=@rootprefix@/sbin/ifup %I
-ExecStop=@rootprefix@/sbin/ifdown %I
-RemainAfterExit=true
diff --git a/systemd-units/ntpd-boot.service.in b/systemd-units/ntpd-boot.service.in
deleted file mode 100644
index 17318c667..000000000
--- a/systemd-units/ntpd-boot.service.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Set clock at boot with NTP
-Before=network.target
-Before=ntpd.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/sbin/run-ntpd-with-config -n -q
-Restart=on-failure
-RestartSec=15
diff --git a/systemd-units/ntpd.service.in b/systemd-units/ntpd.service.in
deleted file mode 100644
index 7226c872a..000000000
--- a/systemd-units/ntpd.service.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Keep clock synchronised with NTP
-Before=network.target
-After=ntpd-boot.service
-
-[Service]
-Type=simple
-ExecStart=/usr/sbin/run-ntpd-with-config -n
-Restart=on-failure
-RestartSec=15
diff --git a/udev-rules/100-baserock.rules b/udev-rules/100-baserock.rules
deleted file mode 100644
index 3fd56da18..000000000
--- a/udev-rules/100-baserock.rules
+++ /dev/null
@@ -1,5 +0,0 @@
-ACTION=="remove", GOTO="baserock_end"
-# run ifup for every network device detected
-SUBSYSTEM=="net", KERNEL!="lo", ENV{SYSTEMD_WANTS}="ifup@%k.service"
-
-LABEL="baserock_end"
-- 
cgit v1.2.1