1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2
index 71fe661a9..ace758232 100755
--- a/perl-install/standalone/harddrake2
+++ b/perl-install/standalone/harddrake2
@@ -102,6 +102,7 @@ my %fields =
      {
       channel => [ N("Channel"), N("EIDE/SCSI channel") ],
       info => [ N("Disk identifier"), N("usually the disk serial number") ],
+      id => [ N("Target id number"), N("the SCSI target identifier") ],
       lun => [ N("Logical unit number"), N("the SCSI Logical Unit Number (LUN). SCSI devices connected to a host are uniquely identified by a
 channel number, a target id and a logical unit number") ],
      },
@@ -148,7 +149,7 @@ my %groups = (
               HARDDISK =>
               {
                N("Identification") => [ qw(Vendor Model description info media_type) ],
-               N("Connection") => [ qw(bus channel lun) ],
+               N("Connection") => [ qw(bus channel lun id) ],
                N("Bus identification") => [ qw(vendor id subvendor subid) ],
                N("Device") => [ qw(device) ],
                N("Partitions") => [ qw(primary_partitions extended_partitions) ],
diff --git a/tools/addchangelog.pl b/tools/addchangelog.pl
index eff3e76ea..27befd6d8 100755
--- a/tools/addchangelog.pl
+++ b/tools/addchangelog.pl
@@ -1,21 +1,18 @@
 #!/usr/bin/perl
 
-@ARGV == 2 or die "usage $0: <dir> <cvslog2changelog script>\n";
+@ARGV == 1 or die "usage $0: <cvslog2changelog script>\n";
 
-($dir, $script) = @ARGV;
+($script) = @ARGV;
 
-chomp(my $cwd = `pwd`);
-$script = "$cwd/$script" if $script !~ m|^/|;
+$date = (split('/', `grep ChangeLog perl-install/CVS/Entries`))[3];
 
-chdir $dir;
-$date = (split('/', `grep ChangeLog CVS/Entries`))[3];
+@changelog = `(cvs log -d ">$date" mdk-stage1 ; cd perl-install; cvs log -d ">$date") | $script`;
+@before = `cat perl-install/ChangeLog`;
 
-@changelog = `cvs log -d ">$date" | $script`;
-@before = `cat ChangeLog`;
-
-print foreach @changelog;
-
-open F, ">ChangeLog";
+open F, ">perl-install/ChangeLog";
 print F foreach @changelog, @before;
 
-system(q(cvs commit -m "New snapshot uploaded" ChangeLog));
+`cvs commit -m '' perl-install/ChangeLog >/dev/null` =~ /new revision: (.*$);/;
+
+print "$1\n";
+print foreach @changelog;