| 1 |
From e1de1e19a46876c1df2c29b7acfbcaab93b2cca4 Mon Sep 17 00:00:00 2001 |
| 2 |
From: Colin Guthrie <colin@mageia.org> |
| 3 |
Date: Sun, 4 Aug 2013 14:26:29 +0100 |
| 4 |
Subject: [PATCH 108/108] Kill mandriva-boot-links script+service |
| 5 |
|
| 6 |
This used to run on boot to create symlinks in /boot for the currently running kernel. |
| 7 |
According to Thomas, this is no longer needed and can be dropped. |
| 8 |
--- |
| 9 |
Makefile | 1 - |
| 10 |
systemd/mandriva-boot-links | 21 --------------------- |
| 11 |
systemd/system/mandriva-boot-links.service | 12 ------------ |
| 12 |
3 files changed, 34 deletions(-) |
| 13 |
delete mode 100755 systemd/mandriva-boot-links |
| 14 |
delete mode 100644 systemd/system/mandriva-boot-links.service |
| 15 |
|
| 16 |
diff --git a/Makefile b/Makefile |
| 17 |
index d0088c8..0861631 100644 |
| 18 |
--- a/Makefile |
| 19 |
+++ b/Makefile |
| 20 |
@@ -114,7 +114,6 @@ install: |
| 21 |
ln -s ../fedora-storage-init.service $(ROOT)/lib/systemd/system/local-fs.target.wants |
| 22 |
ln -s ../fedora-storage-init-late.service $(ROOT)/lib/systemd/system/local-fs.target.wants |
| 23 |
ln -s ../mandriva-kmsg-loglevel.service $(ROOT)/lib/systemd/system/sysinit.target.wants |
| 24 |
- ln -s ../mandriva-boot-links.service $(ROOT)/lib/systemd/system/basic.target.wants |
| 25 |
ln -s ../mandriva-save-dmesg.service $(ROOT)/lib/systemd/system/basic.target.wants |
| 26 |
ln -s ../mandriva-everytime.service $(ROOT)/lib/systemd/system/basic.target.wants |
| 27 |
|
| 28 |
diff --git a/systemd/mandriva-boot-links b/systemd/mandriva-boot-links |
| 29 |
deleted file mode 100755 |
| 30 |
index 50ecc71..0000000 |
| 31 |
--- a/systemd/mandriva-boot-links |
| 32 |
+++ /dev/null |
| 33 |
@@ -1,21 +0,0 @@ |
| 34 |
-#!/bin/sh |
| 35 |
- |
| 36 |
-uname_r=$(uname -r) |
| 37 |
- |
| 38 |
-# Adjust symlinks as necessary in /boot to keep system services from |
| 39 |
-# spewing messages about mismatched System maps and so on. |
| 40 |
-if [ -L /boot/System.map -a -r /boot/System.map-$uname_r -a \ |
| 41 |
- ! /boot/System.map -ef /boot/System.map-$uname_r ] ; then |
| 42 |
- ln -s -f System.map-$uname_r /boot/System.map |
| 43 |
-fi |
| 44 |
-if [ ! -e /boot/System.map -a -r /boot/System.map-$uname_r ] ; then |
| 45 |
- ln -s -f System.map-$uname_r /boot/System.map |
| 46 |
-fi |
| 47 |
- |
| 48 |
-# Adjust symlinks as necessary in /boot to have the default config |
| 49 |
-if [ -L /boot/config -a -r /boot/config-$uname_r ] ; then |
| 50 |
- ln -sf config-$uname_r /boot/config |
| 51 |
-fi |
| 52 |
-if [ ! -e /boot/config -a -r /boot/config-$uname_r ] ; then |
| 53 |
- ln -sf config-$uname_r /boot/config |
| 54 |
-fi |
| 55 |
diff --git a/systemd/system/mandriva-boot-links.service b/systemd/system/mandriva-boot-links.service |
| 56 |
deleted file mode 100644 |
| 57 |
index ced82ef..0000000 |
| 58 |
--- a/systemd/system/mandriva-boot-links.service |
| 59 |
+++ /dev/null |
| 60 |
@@ -1,12 +0,0 @@ |
| 61 |
-[Unit] |
| 62 |
-Description=Setup links in /boot for running kernel |
| 63 |
-DefaultDependencies=no |
| 64 |
-Requires=local-fs.target |
| 65 |
-Conflicts=shutdown.target |
| 66 |
-After=local-fs.target |
| 67 |
-Before=shutdown.target |
| 68 |
- |
| 69 |
-[Service] |
| 70 |
-ExecStart=-/lib/systemd/mandriva-boot-links |
| 71 |
-Type=oneshot |
| 72 |
-RemainAfterExit=yes |
| 73 |
-- |
| 74 |
1.8.3.4 |
| 75 |
|
Parent Directory
| 
Revision Log