Merge file on a Mac
I recently had the need to merge the two files problem, ie the files have the same origin but both are edited in parallel.
To help them reunite opendiff on Mac, is the tool included in XCode .
To select the desired content of the new file, simply select the right under Actions in the desired merge mechanism.
Time Machine and iSCSI
Having made my Time Machine backup to an SMB share in time due to problems with the image problems I've decided to seek a new way. Currently used for storage iSCSI on a Linux server. Does this only the iSCSI target on Linux (Ubuntu in this case) and an iSCSI initiator for the Mac is because in both Leopard and Snow Leopard will not support iSCSI natively.
The installation of the target is under Debian by:
uname -r ` iscsitarget iscsitarget aptitude install-modules-`uname-r`
This is followed by the configuration of the target in /etc/ietd.conf
Target iqn.2009-12 name.streb. Storage.timemachine = / dev / vg_data / lv_timemachine, Type =blockio Lun 0 Path = / dev / vg_data / lv_timemachine, Type = blockio Also known as Time Machine
The configuration change is initiated by the restart of the target daemon: /etc/init.d/iscsitarget restart .
Before that, however, must be /etc/default/iscsitarget to be edited to allow the starting of the daemons.
ISCSITARGET_ENABLE = true
To make iSCSI can be used on the Mac "globalSAN iSCSI" are used to find the software here: http://www.studionetworksolutions.com/support/faq.php?pi=11&fi=51 .
After successful installation, the volume will be involved.
To set the settings brings a globalSAN SystemPref with which the "portal" to the iSCSI target host is set.

globalSAN iSCSI portal
After that, the "target" the available file systems visible.

globalSAN iSCSI Target
After that time machine as you normally set to the new volume, and there you go.
OpenNMS Prowl alerts
Having an iPhone user and Prowl had installed was now to my OpenNMS with Prowl for alerting couple.
Prowl because a well-described API and also provides ready-made scripts for this in various languages (Perl, Python, ...) makes available, I decided for this variant.
I have used this version of Perl, is prowl.pl downloaded here .
However, there was the parameter passing (API key, application, etc.) from OpenNMS to prowl.pl some difficulties. Solution of the problem is a small wrapper that is called by OpenNMS, and in the background according to parameterized prowl.pl calls.
prowl_wrapper.pl
# / Usr / bin / perl-w = "/usr/local/bin/prowl.pl" ; my $ prowl = "/ usr / local / bin / prowl.pl"; = shift ; my $ apikey = shift; = "OpenNMS" ; my $ application = "OpenNMS"; = 1 ; my $ priority = 1; = "Alert" ; my $ event = "alert"; = "" ; my $ msg = ""; @ ARGV ) { foreach (@ ARGV) { $_ . " " ; $ Msg = $ _ ""..; } = $prowl . " -apikey " . $apikey . my $ cmd = $ prowl. "apikey". $ apikey. $application . " \" -priority=" . "Application = \" ". $ Application." \ "Priority =". " -event= \" " . $event . " \" -notification= \" " . $msg . " \" " ; ... $ Priority "event = \" "$ event" \ "-notification = \" \ "" "$ msg.."; = qx ( $cmd ) ; my $ return = qx ($ cmd); ; print $ return;
Important here, the respective Prowl API key for the wrapper is properly adjusted, for this I used the pager email address in order to OpenNMS for each contact to be able to specify another.
Enclosed you will find the necessary configs for OpenNMS:
notificationCommands.xml
> <command binary "true" => <name> notifyProwl </ name> <Execute> / usr / local / bin / prowl_wrapper.pl </ execute> <comment> send notifications Prowl </ comment> > <Argument "false" streamed => <switch> pemail </ switch> </ Argument> > <Argument "false" streamed => <switch> subject </ switch> </ Argument> </ Command>
rootdelay the Linux boot
Just now I had with a brand new Linux installation, a problem the first time the new system. The error was not initially apparent, after a long debugging has shown the error as follows:
During the transition from initrd to the kernel and mounting the file system reported Grub error:
ALERT! /dev/sda2 does not exist. Dropping to a shell!
Then I was greeted by a BusyBox shell of which I unfortunately did not continue.
Problem was simply the loading of the SAS Controller Module (mptsas) takes the system far too long to find the plates and aborts with a timeout.
The error can be explained by the parameter
rootdelay=45
fix in the kernel command line.
See also here at launchpad described.







