aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <w.d.hubbs@gmail.com>2018-12-23 18:30:32 -0600
committerWilliam Hubbs <w.d.hubbs@gmail.com>2018-12-23 21:04:00 -0600
commitd328de198d0ad980188b105decc09405652aa3d6 (patch)
tree8fde9ed1783e255b34cf2e2f295aa00827429404
parenta9fc26ac1367ac887eab76007e8834dfe787edcd (diff)
remove /run migration script again
This time it was done correctly. I missed a '\' the last time.
-rw-r--r--sh/.gitignore1
-rw-r--r--sh/Makefile5
-rw-r--r--sh/migrate-to-run.sh.in36
3 files changed, 2 insertions, 40 deletions
diff --git a/sh/.gitignore b/sh/.gitignore
index 918a9f65..69e3bd03 100644
--- a/sh/.gitignore
+++ b/sh/.gitignore
@@ -4,5 +4,4 @@ openrc-run.sh
cgroup-release-agent.sh
init.sh
init-early.sh
-migrate-to-run.sh
binfmt.sh
diff --git a/sh/Makefile b/sh/Makefile
index 259954c7..ef590e81 100644
--- a/sh/Makefile
+++ b/sh/Makefile
@@ -13,9 +13,8 @@ include ${MK}/os.mk
SRCS-FreeBSD=
BIN-FreeBSD=
-SRCS-Linux= binfmt.sh.in cgroup-release-agent.sh.in init-early.sh.in \
- migrate-to-run.sh.in
-BIN-Linux= binfmt.sh cgroup-release-agent.sh init-early.sh migrate-to-run.sh
+SRCS-Linux= binfmt.sh.in cgroup-release-agent.sh.in init-early.sh.in
+BIN-Linux= binfmt.sh cgroup-release-agent.sh init-early.sh
INC-Linux= rc-cgroup.sh
SRCS-NetBSD=
diff --git a/sh/migrate-to-run.sh.in b/sh/migrate-to-run.sh.in
deleted file mode 100644
index 7dc85e66..00000000
--- a/sh/migrate-to-run.sh.in
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2012-2015 The OpenRC Authors.
-# See the Authors file at the top-level directory of this distribution and
-# https://github.com/OpenRC/openrc/blob/master/AUTHORS
-#
-# This file is part of OpenRC. It is subject to the license terms in
-# the LICENSE file found in the top-level directory of this
-# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
-# This file may not be copied, modified, propagated, or distributed
-# except according to the terms contained in the LICENSE file.
-
-. "@LIBEXECDIR@/sh/functions.sh"
-
-if [ -e /run/openrc/softlevel ]; then
- einfo "The OpenRC dependency data has already been migrated."
- exit 0
-fi
-
-if [ ! -d /run ]; then
- eerror "/run is not a directory."
- eerror "moving /run to /run.pre-openrc"
- mv /run /run.pre-openrc
- mkdir /run
-fi
-
-rm -rf /run/openrc
-
-if ! mountinfo -q -f tmpfs /run; then
- ln -s "@LIBEXECDIR@"/init.d /run/openrc
-else
- cp -a "@LIBEXECDIR@/init.d" /run/openrc
- rc-update -u
-fi
-
-einfo "The OpenRC dependency data was migrated successfully."
-exit 0