Kaydet (Commit) 70f0cbf7 authored tarafından Ozan Çağlayan's avatar Ozan Çağlayan

Start sysklogd after startNetwork and remove redundant sysklogd as it's manually started.

üst def57bb0
2009-01-06 Ozan Çağlayan <ozan@pardus.org.tr>
* bin/mudur.py (startServices): Start sysklogd after startNetwork and
remove redundant sysklogd as it's manually started.
2008-12-26 Onur Küçük <onur@pardus.org.tr>
* bin/mudur.py (cleanupTmp) : Add kde4 directories.
......
......@@ -144,8 +144,6 @@ def waitBus(unix_name, timeout=5, wait=0.1, stream=True):
time.sleep(wait)
return False
#
class Logger:
def __init__(self):
self.lines = []
......@@ -573,8 +571,6 @@ def ttyUnicode():
except:
ui.error(_("Could not set unicode mode on tty %d") % i)
#
def mount(part, args):
ent = config.get_mount(part)
if ent and len(ent) > 3:
......@@ -674,10 +670,6 @@ def startServices(extras=None):
except dbus.DBusException:
ui.error(_("Cannot connect to DBus, services won't be started"))
return
# Almost everything depends on logger, so start manually
startService("sysklogd")
if not waitBus("/dev/log", stream=False, timeout=15):
ui.warn(_("Cannot start system logger"))
if extras:
for service in extras:
......@@ -686,6 +678,7 @@ def startServices(extras=None):
except dbus.DBusException:
pass
return
# Remove unnecessary lock files - bug #7212
for _file in os.listdir("/etc/network"):
if _file.startswith("."):
......@@ -694,9 +687,19 @@ def startServices(extras=None):
# Start network service
startNetwork(bus)
# Almost everything depends on logger, so start manually
startService("sysklogd")
if not waitBus("/dev/log", stream=False, timeout=15):
ui.warn(_("Cannot start system logger"))
if not config.get("safe"):
ui.info(_("Starting services"))
services = getServices(bus)
# Remove redundant sysklogd
if "sysklogd" in services:
services.remove("sysklogd")
# Give login screen a headstart
head_start = config.get("head_start")
if head_start and head_start in services:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment