[bwbar] added systemd files almost remove '-D' daemon feature (not needed with systemd)
Adrian Reber
adrian at fedoraproject.org
Thu Jan 26 21:49:30 UTC 2012
commit 22e56266c04f45b7620a4b4d1a3bfee172afb4be
Author: Adrian Reber <adrian at lisas.de>
Date: Thu Jan 26 22:49:22 2012 +0100
added systemd files
almost remove '-D' daemon feature (not needed with systemd)
bwbar.daemon.patch | 44 +-------------------------------------------
bwbar.spec | 1 +
2 files changed, 2 insertions(+), 43 deletions(-)
---
diff --git a/bwbar.daemon.patch b/bwbar.daemon.patch
index 47ad301..0efebc0 100644
--- a/bwbar.daemon.patch
+++ b/bwbar.daemon.patch
@@ -1,27 +1,7 @@
diff -u bwbar-1.2.3/bwbar.c bwbar-1.2.3.new/bwbar.c
--- bwbar-1.2.3/bwbar.c 2006-08-26 18:31:26.000000000 +0200
+++ bwbar-1.2.3.new/bwbar.c 2008-09-01 11:30:41.000000000 +0200
-@@ -156,6 +156,7 @@
- { "kbps", 0, 0, 'k' },
- { "Mbps", 0, 0, 'M' },
- { "Gbps", 0, 0, 'G' },
-+ { "Daemon", 0, 0, 'D' },
- { "help", 0, 0, 'h' },
- { 0, 0, 0, 0 }
- };
-@@ -178,6 +179,7 @@
- " --kbps -k Bandwidth is measured in kbit/s\n"
- " --Mbps -M Bandwidth is measured in Mbit/s (default)\n"
- " --Gbps -G Bandwidth is measured in Gbit/s\n"
-+ " --Daemon -D Run as daemon\n"
- " --help -h Display this text\n",
- program);
- exit(err);
-@@ -211,10 +213,11 @@
- int width = 600; /* Bar width */
- int height = 4; /* Bar height */
- int border = 1; /* Bar border */
-+ int daemon_mode = 0; /* run as daemon */
+@@ -214,7 +214,7 @@
program = argv[0];
@@ -30,25 +10,3 @@ diff -u bwbar-1.2.3/bwbar.c bwbar-1.2.3.new/bwbar.c
switch ( opt ) {
case 'i':
measure_input = 1;
-@@ -252,6 +255,9 @@
- unit = 1.0e+9;
- unit_name = "Gbit/s";
- break;
-+ case 'D':
-+ daemon_mode = 1;
-+ break;
- case 'h':
- usage(0);
- break;
-@@ -279,6 +285,11 @@
- first = 1;
- lbin = 0; lbout = 0;
-
-+ if ( daemon_mode == 1) {
-+ if ( fork() != 0)
-+ return 0;
-+ }
-+
- gettimeofday(&t_last, NULL);
-
- while ( 1 ) {
diff --git a/bwbar.spec b/bwbar.spec
index 995ca9b..70d2371 100644
--- a/bwbar.spec
+++ b/bwbar.spec
@@ -88,6 +88,7 @@ fi
%changelog
* Wed Jan 25 2012 Adrian Reber <adrian at lisas.de> - 1.2.3-11
- added systemd files
+- almost remove '-D' daemon feature (not needed with systemd)
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.3-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list