From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: =?koi8-r?Q?=F7=D1=DE=C5=D3=CC=C1=D7_?= =?koi8-r?Q?=E4=C9=CB=CF=CE=CF=D7?= To: ALT Linux Sisyphus discussion list In-Reply-To: <20060417132116.GD1280@basalt.office.altlinux.org> References: <1145035358.7325.11.camel@alpha.degunino.ru> <20060416195847.GC20278@basalt.office.altlinux.org> <1145275347.15634.19.camel@alpha.degunino.ru> <20060417132116.GD1280@basalt.office.altlinux.org> Content-Type: multipart/mixed; boundary="=-PnqzvR393yVvrJB72cgu" Date: Wed, 19 Apr 2006 11:04:53 +0400 Message-Id: <1145430293.7086.41.camel@alpha.degunino.ru> Mime-Version: 1.0 X-Mailer: Evolution 2.5.91 (2.5.91-alt1) Subject: Re: [sisyphus] =?koi8-r?b?dXBzZCDJ2iDLz9LPwsvJ?= X-BeenThere: sisyphus@lists.altlinux.org X-Mailman-Version: 2.1.7 Precedence: list Reply-To: ALT Linux Sisyphus discussion list List-Id: ALT Linux Sisyphus discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Apr 2006 07:04:45 -0000 Archived-At: List-Archive: List-Post: --=-PnqzvR393yVvrJB72cgu Content-Type: text/plain; charset=KOI8-R Content-Transfer-Encoding: base64 9yDwzsQsIDE3LzA0LzIwMDYg1yAxNzoyMSArMDQwMCwgRG1pdHJ5IFYuIExldmluINDJ28XUOg0K DQo+ID4g79TLwdTJzCwg0MXSxdXT1MHOz9fJzCwgzsHT1NLPycwgDQo+ID4gIyBzZXJ2aWNlIHVw c2RydiBzdGFydCANCj4gPiAjDQo+ID4gySDUydvJzsEuIO7JIM/Ezs/HzyDTyc3Xz8zBIM7BINzL 0sHOxS4g8NLPw8XT0yDOxSDawdDV3cXOLiDuwSBVU0INCj4gy8nXwdTYIM7FIM7BxM8sINMgzsnN INfTxSDXINDP0tHEy8UsINDPIENPTSDUz9bFINPBzc/FLg0KPiA+IA0KPiA+ICMgc2VydmljZSB1 cHNkIHN0YXJ0IA0KPiA+ICMNCj4gPiDJINTJ28nOwS4NCj4gDQo+IOXTzMkNCj4gIyB1cHNkcnZj dGwgbGlzdA0KPiDOyd7Fx88gzsUg0M/LwdrZ18HF1Cwg1M8g3NTPINDSydrOwcsgzsXEz87B09TS z8XOzs/T1MkNCj4g1yAvZXRjL251dC91cHMuY29uZg0KDQpbc2xhdmFAYWxwaGEgfl0kIHN1ZG8g dXBzZHJ2Y3RsIGxpc3QNCk5ldHdvcmsgVVBTIFRvb2xzIC0gVVBTIGRyaXZlciBjb250cm9sbGVy IDIuMC4yDQovbGliL251dC9hcGNzbWFydA0KDQr81M8g1dbFICLOz9fZyiIgVVBTIChTbWFydC1V UFMgU1U2MjBpbmV0KS4g68HS1MnOwSDUwSDWxS4g99PFIM7B09TSz8XOzy4NCvfTxSDSwcLP1MHF 1Cwgzs8gxMzRIM/CyM/EwSBwZXJtaXNzaW9uIGRlbmllZCDQ0snIz8TJ1NPRIM/Uy8zA3sHU2A0K xMHXwcXN2cUgydogy8/Sz8LLySBjaHJvb3QgySDTyc3Myc7LyS4gDQoNCg0K68/T1NnM2M7ZxSDJ 2s3FzsXOydEg1yAvZXRjL2luaXQuZC91cHMqINPNLiDXINDSyczBx8HFzdnIIGRpZmYuIPDP08zF DQrc1M/HzyDX08Ug2sHNxd7B1MXM2M7PIM7B3snOwcXUINrB0NXTy8HU2NPRLCDQydvF1CBbRE9O RV0gySDSwcLP1MHF1C4NCg0K8SDEzyDTycgg0M/SIM7FINDPztHMLCDQz97FzdUg1yDLz9LPws/e zs/NIN7S1dTFIMvPzsbJx8kgzsXEz9PU1dDO2S4NCg0KDQr81M8g0SDJzcXAINPFyt7B0yDEzNEg zsHHzNHEzs/T1Mk6IA0KW3NsYXZhQGFscGhhIH5dJCB1cHNjIFNtYXJ0LVVQU0AxMjcuMC4wLjEN CmJhdHRlcnkuYWxhcm0udGhyZXNob2xkOiAwDQpiYXR0ZXJ5LmNoYXJnZTogMTAwLjANCmJhdHRl cnkuY2hhcmdlLnJlc3RhcnQ6IDAwDQpiYXR0ZXJ5LmRhdGU6IDA2LzIzLzAxDQpiYXR0ZXJ5LnJ1 bnRpbWU6IDkwMA0KYmF0dGVyeS5ydW50aW1lLmxvdzogMTIwDQpiYXR0ZXJ5LnZvbHRhZ2U6IDEz Ljc3ICAgICAgICAgINDP3sXN1T8NCmJhdHRlcnkudm9sdGFnZS5ub21pbmFsOiAwMTIgICAgxdPM ySDU1dQgMTINCmRyaXZlci5uYW1lOiBhcGNzbWFydA0KZHJpdmVyLnBhcmFtZXRlci5wb3J0OiAv ZGV2L3R0eVMxDQpkcml2ZXIudmVyc2lvbjogMi4wLjINCmRyaXZlci52ZXJzaW9uLmludGVybmFs OiAxLjk5LjcNCmlucHV0LmZyZXF1ZW5jeTogNTAuMDANCmlucHV0LnF1YWxpdHk6IEZGDQppbnB1 dC5zZW5zaXRpdml0eTogSA0KaW5wdXQudHJhbnNmZXIuaGlnaDogMjUzDQppbnB1dC50cmFuc2Zl ci5sb3c6IDIwOA0KaW5wdXQudHJhbnNmZXIucmVhc29uOiBTDQppbnB1dC52b2x0YWdlOiAyMzEu OA0KaW5wdXQudm9sdGFnZS5tYXhpbXVtOiAyMzMuMg0KaW5wdXQudm9sdGFnZS5taW5pbXVtOiAy MzEuOA0Kb3V0cHV0LnZvbHRhZ2U6IDIzMS44DQpvdXRwdXQudm9sdGFnZS50YXJnZXQuYmF0dGVy eTogMjMwDQp1cHMuZGVsYXkuc2h1dGRvd246IDAyMA0KdXBzLmRlbGF5LnN0YXJ0OiAwMDANCnVw cy5maXJtd2FyZTogMjIuNi5JDQp1cHMuaWQ6IFVQU19JREVODQp1cHMubG9hZDogMDQzLjUNCnVw cy5tZnI6IEFQQw0KdXBzLm1mci5kYXRlOiAwNi8yMy8wMQ0KdXBzLm1vZGVsOiBTbWFydC1VUFMg NjIwDQp1cHMuc2VyaWFsOiBOUzAxMjUyNDI4OTcNCnVwcy5zdGF0dXM6IE9MDQp1cHMudGVzdC5p bnRlcnZhbDogMTIwOTYwMA0KdXBzLnRlc3QucmVzdWx0OiBOTyAgICAgICDU1dQgzsXQz87R1M7P LiD0xdPUINDSySDXy8zA3sXOyckg0NLPyM/EydQg7+suDQpbc2xhdmFAYWxwaGEgfl0kDQoNCg0K DQo= --=-PnqzvR393yVvrJB72cgu Content-Disposition: attachment; filename=upsd.diff Content-Type: text/x-patch; name=upsd.diff; charset=KOI8-R Content-Transfer-Encoding: 7bit --- upsd~ 2006-04-14 22:36:18 +0400 +++ upsd 2006-04-14 22:46:58 +0400 @@ -21,7 +21,7 @@ start() { - upsd_configured || return 0 +# upsd_configured || return 0 msg_starting $"UPS information" if ! service upsdrv status >/dev/null 2>&1; then @@ -31,7 +31,7 @@ echo return $RETVAL fi - start_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" --expect-user upsd --no-announce -- upsd $UPSD_OPTIONS + start_daemon --pidfile "$PIDFILE" --lockfile "$LOCKFILE" --expect-user upsd --no-announce -- upsd -u upsd RETVAL=$? return $RETVAL } --=-PnqzvR393yVvrJB72cgu Content-Disposition: attachment; filename=upsdrv.diff Content-Type: text/x-patch; name=upsdrv.diff; charset=KOI8-R Content-Transfer-Encoding: 7bit --- upsdrv~ 2006-04-14 22:32:37 +0400 +++ upsdrv 2006-04-14 22:47:47 +0400 @@ -18,17 +18,18 @@ get_drvlist() { - DRVLIST="$((find $CHROOTDIR/ -maxdepth 1 -name '*-*.pid' -type f | - sed -ne 's,'$CHROOTDIR'/\([^/-]\+\)-[^/-]\+\.pid$,/lib/nut/\1,p'; +# DRVLIST="$((find $CHROOTDIR/ -maxdepth 1 -name '*-*.pid' -type f | +# sed -ne 's,'$CHROOTDIR'/\([^/-]\+\)-[^/-]\+\.pid$,/lib/nut/\1,p'; + DRVLIST="$((find /var/lib/upsd -maxdepth 1 -name '*-*.pid' -type f | upsdrvctl list 2>/dev/null |grep ^/ ) |sort -u)" } start() { - upsd_configured || return 0 +# upsd_configured || return 0 - action "Starting UPS drivers:" upsdrvctl $UPSDRV_OPTIONS start + action "Starting UPS drivers:" upsdrvctl -u upsdrv start RETVAL=$? [ $RETVAL -eq 0 ] && touch "$LOCKFILE" return $RETVAL --=-PnqzvR393yVvrJB72cgu--