From 12451218fbcb275ad23ef96ca60324810b53c474 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Mon, 7 Apr 2014 10:45:09 +0200 Subject: remove fedora-configure --- Makefile | 1 - systemd/fedora-configure | 20 -------------------- systemd/system/fedora-configure.service | 15 --------------- 3 files changed, 36 deletions(-) delete mode 100755 systemd/fedora-configure delete mode 100644 systemd/system/fedora-configure.service diff --git a/Makefile b/Makefile index 7d1eff56..ccf79931 100644 --- a/Makefile +++ b/Makefile @@ -91,7 +91,6 @@ install: mkdir -p -m 755 $(ROOT)/usr/lib/systemd/system/local-fs.target.wants mkdir -p -m 755 $(ROOT)/usr/lib/systemd/system/basic.target.wants mkdir -p -m 755 $(ROOT)/usr/lib/systemd/system/sysinit.target.wants - ln -s ../fedora-configure.service $(ROOT)/usr/lib/systemd/system/basic.target.wants ln -s ../fedora-loadmodules.service $(ROOT)/usr/lib/systemd/system/basic.target.wants ln -s ../fedora-autorelabel.service $(ROOT)/usr/lib/systemd/system/basic.target.wants ln -s ../fedora-autorelabel-mark.service $(ROOT)/usr/lib/systemd/system/basic.target.wants diff --git a/systemd/fedora-configure b/systemd/fedora-configure deleted file mode 100755 index 64f535f6..00000000 --- a/systemd/fedora-configure +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -# -# Configure machine if necessary. - -. /etc/init.d/functions - -if [ -x /bin/plymouth ]; then - /bin/plymouth quit -fi - -if [ -x /usr/sbin/firstboot ]; then - /usr/sbin/firstboot -fi - -# Reread in network configuration data. -if [ -r /etc/hostname ]; then - HOSTNAME=$(cat /etc/hostname) - # Reset the hostname. - action $"Resetting hostname ${HOSTNAME}: " hostname ${HOSTNAME} -fi diff --git a/systemd/system/fedora-configure.service b/systemd/system/fedora-configure.service deleted file mode 100644 index 9564ae55..00000000 --- a/systemd/system/fedora-configure.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Reconfigure the system on administrator request -DefaultDependencies=no -Conflicts=shutdown.target -Before=multi-user.target shutdown.target -After=local-fs.target -ConditionPathExists=/.unconfigured - -[Service] -ExecStart=/lib/systemd/fedora-configure -ExecStopPost=/bin/rm -f /.unconfigured -Type=oneshot -TimeoutSec=0 -StandardInput=tty -RemainAfterExit=yes -- cgit v1.2.1