aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2014-08-30 13:44:22 +0100
committerColin Guthrie <colin@mageia.org>2014-08-30 13:46:08 +0100
commit3a40f45535d700c961617dc38204b28b20c99bd7 (patch)
tree1279fdf277bf233c40adf6e3f922aa49ac9f13e2
parent831eca5a4759006d14cb431d111953e468b4c729 (diff)
downloadinitscripts-3a40f45535d700c961617dc38204b28b20c99bd7.tar
initscripts-3a40f45535d700c961617dc38204b28b20c99bd7.tar.gz
initscripts-3a40f45535d700c961617dc38204b28b20c99bd7.tar.bz2
initscripts-3a40f45535d700c961617dc38204b28b20c99bd7.tar.xz
initscripts-3a40f45535d700c961617dc38204b28b20c99bd7.zip
Don't frob the console loglevel on boot
This was disabled upstream, but we inherited a Mandriva systemd-ified version of this. Let's kill it off. Originally fixed upstream in ba3f278b5d916b646e8cfca25cd32e3b8acf523e: Don't frob the console loglevel on boot. (#621257, #626572) 1) This didn't do anything useful prior to rsyslog, as sysklogd would reset it. 2) This overrides the kernel commandline, for people who want to temporarily reset it there 3) This actually turns messages back on out from underneath plymouth, which isn't nice. To frob the console loglevel, pass it on the kernel command line.
-rw-r--r--Makefile1
-rw-r--r--systemd/system/mandriva-kmsg-loglevel.service10
2 files changed, 0 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index a141b494..1248e672 100644
--- a/Makefile
+++ b/Makefile
@@ -109,7 +109,6 @@ install:
ln -s ../fedora-autorelabel-mark.service $(ROOT)/usr/lib/systemd/system/basic.target.wants
ln -s ../fedora-readonly.service $(ROOT)/usr/lib/systemd/system/local-fs.target.wants
ln -s ../fedora-import-state.service $(ROOT)/usr/lib/systemd/system/local-fs.target.wants
- ln -s ../mandriva-kmsg-loglevel.service $(ROOT)/usr/lib/systemd/system/sysinit.target.wants
ln -s ../mandriva-save-dmesg.service $(ROOT)/usr/lib/systemd/system/basic.target.wants
ln -s ../mandriva-everytime.service $(ROOT)/usr/lib/systemd/system/basic.target.wants
diff --git a/systemd/system/mandriva-kmsg-loglevel.service b/systemd/system/mandriva-kmsg-loglevel.service
deleted file mode 100644
index 4e92e429..00000000
--- a/systemd/system/mandriva-kmsg-loglevel.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Set default kernel console loglevel
-DefaultDependencies=no
-Conflicts=shutdown.target
-
-[Service]
-EnvironmentFile=/etc/sysconfig/init
-ExecStart=/bin/dmesg -n $LOGLEVEL
-Type=oneshot
-RemainAfterExit=yes