Author: waldi Date: Thu Mar 17 11:51:31 2011 New Revision: 834 Log: * debian/patches/series: Readd patch. * debian/patches/tools-misc-xend-startup.diff: Again remove blktapctrl. Added: trunk/xen/debian/patches/tools-misc-xend-startup.diff Modified: trunk/xen/debian/patches/series Modified: trunk/xen/debian/patches/series =============================================================================--- trunk/xen/debian/patches/series Thu Mar 17 11:42:37 2011 (r833) +++ trunk/xen/debian/patches/series Thu Mar 17 11:51:31 2011 (r834) @@ -36,6 +36,7 @@ tools-xentrace-rpath.diff tools-python-xen-relative-path.diff +tools-misc-xend-startup.diff tools-disable.diff tools-firmware-etherboot-packaged.diff Added: trunk/xen/debian/patches/tools-misc-xend-startup.diff =============================================================================--- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/xen/debian/patches/tools-misc-xend-startup.diff Thu Mar 17 11:51:31 2011 (r834) @@ -0,0 +1,35 @@ +--- a/tools/misc/xend ++++ b/tools/misc/xend +@@ -71,13 +71,6 @@ + hline() + raise CheckError("invalid user") + +-def start_daemon(daemon, *args): +- if os.fork() == 0: +- os.execvp(daemon, (daemon,) + args) +- +-def start_blktapctrl(): +- start_daemon("blktapctrl", "") +- + def main(): + try: + check_logging() +@@ -89,18 +82,14 @@ + if not sys.argv[1:]: + print ''usage: %s {start|stop|reload|restart}'' % sys.argv[0] + elif sys.argv[1] == ''start'': +- if os.uname()[0] != "SunOS": +- start_blktapctrl() + return daemon.start() + elif sys.argv[1] == ''trace_start'': +- start_blktapctrl() + return daemon.start(trace=1) + elif sys.argv[1] == ''stop'': + return daemon.stop() + elif sys.argv[1] == ''reload'': + return daemon.reloadConfig() + elif sys.argv[1] == ''restart'': +- start_blktapctrl() + return daemon.stop() or daemon.start() + elif sys.argv[1] == ''status'': + return daemon.status()