aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2013-08-04 14:26:29 +0100
committerColin Guthrie <colin@mageia.org>2013-08-04 14:26:29 +0100
commite1de1e19a46876c1df2c29b7acfbcaab93b2cca4 (patch)
treea9b327fae77b1d5852e62afda6ad368b78105cd2
parent262427f6197e1e00fea9687c99eb77c417543be2 (diff)
downloadinitscripts-e1de1e19a46876c1df2c29b7acfbcaab93b2cca4.tar
initscripts-e1de1e19a46876c1df2c29b7acfbcaab93b2cca4.tar.gz
initscripts-e1de1e19a46876c1df2c29b7acfbcaab93b2cca4.tar.bz2
initscripts-e1de1e19a46876c1df2c29b7acfbcaab93b2cca4.tar.xz
initscripts-e1de1e19a46876c1df2c29b7acfbcaab93b2cca4.zip
Kill mandriva-boot-links script+service
This used to run on boot to create symlinks in /boot for the currently running kernel. According to Thomas, this is no longer needed and can be dropped.
-rw-r--r--Makefile1
-rwxr-xr-xsystemd/mandriva-boot-links21
-rw-r--r--systemd/system/mandriva-boot-links.service12
3 files changed, 0 insertions, 34 deletions
diff --git a/Makefile b/Makefile
index d0088c8e..08616315 100644
--- a/Makefile
+++ b/Makefile
@@ -114,7 +114,6 @@ install:
ln -s ../fedora-storage-init.service $(ROOT)/lib/systemd/system/local-fs.target.wants
ln -s ../fedora-storage-init-late.service $(ROOT)/lib/systemd/system/local-fs.target.wants
ln -s ../mandriva-kmsg-loglevel.service $(ROOT)/lib/systemd/system/sysinit.target.wants
- ln -s ../mandriva-boot-links.service $(ROOT)/lib/systemd/system/basic.target.wants
ln -s ../mandriva-save-dmesg.service $(ROOT)/lib/systemd/system/basic.target.wants
ln -s ../mandriva-everytime.service $(ROOT)/lib/systemd/system/basic.target.wants
diff --git a/systemd/mandriva-boot-links b/systemd/mandriva-boot-links
deleted file mode 100755
index 50ecc71c..00000000
--- a/systemd/mandriva-boot-links
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-uname_r=$(uname -r)
-
-# Adjust symlinks as necessary in /boot to keep system services from
-# spewing messages about mismatched System maps and so on.
-if [ -L /boot/System.map -a -r /boot/System.map-$uname_r -a \
- ! /boot/System.map -ef /boot/System.map-$uname_r ] ; then
- ln -s -f System.map-$uname_r /boot/System.map
-fi
-if [ ! -e /boot/System.map -a -r /boot/System.map-$uname_r ] ; then
- ln -s -f System.map-$uname_r /boot/System.map
-fi
-
-# Adjust symlinks as necessary in /boot to have the default config
-if [ -L /boot/config -a -r /boot/config-$uname_r ] ; then
- ln -sf config-$uname_r /boot/config
-fi
-if [ ! -e /boot/config -a -r /boot/config-$uname_r ] ; then
- ln -sf config-$uname_r /boot/config
-fi
diff --git a/systemd/system/mandriva-boot-links.service b/systemd/system/mandriva-boot-links.service
deleted file mode 100644
index ced82ef0..00000000
--- a/systemd/system/mandriva-boot-links.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Setup links in /boot for running kernel
-DefaultDependencies=no
-Requires=local-fs.target
-Conflicts=shutdown.target
-After=local-fs.target
-Before=shutdown.target
-
-[Service]
-ExecStart=-/lib/systemd/mandriva-boot-links
-Type=oneshot
-RemainAfterExit=yes