diff options
author | Reinhard Tartler <siretart@tauware.de> | 2008-02-02 08:31:52 +0100 |
---|---|---|
committer | Reinhard Tartler <siretart@tauware.de> | 2008-02-02 08:31:52 +0100 |
commit | 2787035d98661881477d696403ca2a78b49322d5 (patch) | |
tree | 0a018e13726a0232332ac23565e1a7df32cdcc06 /lib/raidfile | |
parent | 2733267954e91e394fbb512ea3abb4c497c0752f (diff) |
import version 0.11rc2
This commit has been made by 'bzr import'. I used the upstream tarball
of Version 0.11rc2 for creating it. It has the md5sum:
68052f963a944c717a50bd65a54375ff
Diffstat (limited to 'lib/raidfile')
-rw-r--r-- | lib/raidfile/RaidFileController.cpp | 5 | ||||
-rw-r--r-- | lib/raidfile/RaidFileController.h | 5 | ||||
-rw-r--r-- | lib/raidfile/RaidFileException.h | 5 | ||||
-rw-r--r-- | lib/raidfile/RaidFileRead.cpp | 5 | ||||
-rw-r--r-- | lib/raidfile/RaidFileRead.h | 5 | ||||
-rw-r--r-- | lib/raidfile/RaidFileUtil.cpp | 5 | ||||
-rw-r--r-- | lib/raidfile/RaidFileUtil.h | 5 | ||||
-rw-r--r-- | lib/raidfile/RaidFileWrite.cpp | 5 | ||||
-rw-r--r-- | lib/raidfile/RaidFileWrite.h | 5 | ||||
-rwxr-xr-x | lib/raidfile/raidfile-config | 24 | ||||
-rwxr-xr-x | lib/raidfile/raidfile-config.in | 19 |
11 files changed, 52 insertions, 36 deletions
diff --git a/lib/raidfile/RaidFileController.cpp b/lib/raidfile/RaidFileController.cpp index 4087d751..dbac04c8 100644 --- a/lib/raidfile/RaidFileController.cpp +++ b/lib/raidfile/RaidFileController.cpp @@ -1,11 +1,12 @@ -// distribution boxbackup-0.11rc1 (svn version: 2023_2024) +// distribution boxbackup-0.11rc2 (svn version: 2072) // -// Copyright (c) 2003 - 2006 +// Copyright (c) 2003 - 2008 // Ben Summers and contributors. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: +// // 1. Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // 2. Redistributions in binary form must reproduce the above copyright diff --git a/lib/raidfile/RaidFileController.h b/lib/raidfile/RaidFileController.h index e3e5352d..92498eb2 100644 --- a/lib/raidfile/RaidFileController.h +++ b/lib/raidfile/RaidFileController.h @@ -1,11 +1,12 @@ -// distribution boxbackup-0.11rc1 (svn version: 2023_2024) +// distribution boxbackup-0.11rc2 (svn version: 2072) // -// Copyright (c) 2003 - 2006 +// Copyright (c) 2003 - 2008 // Ben Summers and contributors. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: +// // 1. Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // 2. Redistributions in binary form must reproduce the above copyright diff --git a/lib/raidfile/RaidFileException.h b/lib/raidfile/RaidFileException.h index 6ce00fd8..adf5c318 100644 --- a/lib/raidfile/RaidFileException.h +++ b/lib/raidfile/RaidFileException.h @@ -1,11 +1,12 @@ -// distribution boxbackup-0.11rc1 (svn version: 2023_2024) +// distribution boxbackup-0.11rc2 (svn version: 2072) // -// Copyright (c) 2003 - 2006 +// Copyright (c) 2003 - 2008 // Ben Summers and contributors. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: +// // 1. Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // 2. Redistributions in binary form must reproduce the above copyright diff --git a/lib/raidfile/RaidFileRead.cpp b/lib/raidfile/RaidFileRead.cpp index 29adeab2..3e969188 100644 --- a/lib/raidfile/RaidFileRead.cpp +++ b/lib/raidfile/RaidFileRead.cpp @@ -1,11 +1,12 @@ -// distribution boxbackup-0.11rc1 (svn version: 2023_2024) +// distribution boxbackup-0.11rc2 (svn version: 2072) // -// Copyright (c) 2003 - 2006 +// Copyright (c) 2003 - 2008 // Ben Summers and contributors. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: +// // 1. Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // 2. Redistributions in binary form must reproduce the above copyright diff --git a/lib/raidfile/RaidFileRead.h b/lib/raidfile/RaidFileRead.h index 09841d8b..083e053f 100644 --- a/lib/raidfile/RaidFileRead.h +++ b/lib/raidfile/RaidFileRead.h @@ -1,11 +1,12 @@ -// distribution boxbackup-0.11rc1 (svn version: 2023_2024) +// distribution boxbackup-0.11rc2 (svn version: 2072) // -// Copyright (c) 2003 - 2006 +// Copyright (c) 2003 - 2008 // Ben Summers and contributors. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: +// // 1. Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // 2. Redistributions in binary form must reproduce the above copyright diff --git a/lib/raidfile/RaidFileUtil.cpp b/lib/raidfile/RaidFileUtil.cpp index e36b3f21..46849bb3 100644 --- a/lib/raidfile/RaidFileUtil.cpp +++ b/lib/raidfile/RaidFileUtil.cpp @@ -1,11 +1,12 @@ -// distribution boxbackup-0.11rc1 (svn version: 2023_2024) +// distribution boxbackup-0.11rc2 (svn version: 2072) // -// Copyright (c) 2003 - 2006 +// Copyright (c) 2003 - 2008 // Ben Summers and contributors. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: +// // 1. Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // 2. Redistributions in binary form must reproduce the above copyright diff --git a/lib/raidfile/RaidFileUtil.h b/lib/raidfile/RaidFileUtil.h index 487fb51d..4d10ca0d 100644 --- a/lib/raidfile/RaidFileUtil.h +++ b/lib/raidfile/RaidFileUtil.h @@ -1,11 +1,12 @@ -// distribution boxbackup-0.11rc1 (svn version: 2023_2024) +// distribution boxbackup-0.11rc2 (svn version: 2072) // -// Copyright (c) 2003 - 2006 +// Copyright (c) 2003 - 2008 // Ben Summers and contributors. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: +// // 1. Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // 2. Redistributions in binary form must reproduce the above copyright diff --git a/lib/raidfile/RaidFileWrite.cpp b/lib/raidfile/RaidFileWrite.cpp index 04a7995c..762680a7 100644 --- a/lib/raidfile/RaidFileWrite.cpp +++ b/lib/raidfile/RaidFileWrite.cpp @@ -1,11 +1,12 @@ -// distribution boxbackup-0.11rc1 (svn version: 2023_2024) +// distribution boxbackup-0.11rc2 (svn version: 2072) // -// Copyright (c) 2003 - 2006 +// Copyright (c) 2003 - 2008 // Ben Summers and contributors. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: +// // 1. Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // 2. Redistributions in binary form must reproduce the above copyright diff --git a/lib/raidfile/RaidFileWrite.h b/lib/raidfile/RaidFileWrite.h index a3693f97..45c1e46d 100644 --- a/lib/raidfile/RaidFileWrite.h +++ b/lib/raidfile/RaidFileWrite.h @@ -1,11 +1,12 @@ -// distribution boxbackup-0.11rc1 (svn version: 2023_2024) +// distribution boxbackup-0.11rc2 (svn version: 2072) // -// Copyright (c) 2003 - 2006 +// Copyright (c) 2003 - 2008 // Ben Summers and contributors. All rights reserved. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions // are met: +// // 1. Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // 2. Redistributions in binary form must reproduce the above copyright diff --git a/lib/raidfile/raidfile-config b/lib/raidfile/raidfile-config index 41f38cd5..3af59c93 100755 --- a/lib/raidfile/raidfile-config +++ b/lib/raidfile/raidfile-config @@ -1,12 +1,13 @@ #!/usr/bin/perl -# distribution boxbackup-0.11rc1 (svn version: 2023_2024) +# distribution boxbackup-0.11rc2 (svn version: 2072) # -# Copyright (c) 2003 - 2006 +# Copyright (c) 2003 - 2008 # Ben Summers and contributors. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: +# # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright @@ -54,14 +55,17 @@ Setup raidfile config utility. Bad command line parameters. Usage: - raidfile-config config-dir block-size dir0 [dir1 dir2] + raidfile-config config-dir block-size dir0 [dir1 dir2] -config-dir usually /etc/box -block-size must be a power of two, and usually the block or fragment size of your filing system -dir0, dir1, dir2 are the directories used as the root of the raid file system +Parameters: + config-dir is usually /etc/box + block-size must be a power of two, and usually the block or + fragment size of your file system + dir0, dir1, dir2 are the directories used as the root of the raid + file system -If only one directory is specified, then userland RAID is disabled. Specifying three directories -enables it. +If only one directory is specified, then userland RAID is disabled. +Specifying three directories enables it. __E exit(1); @@ -95,7 +99,7 @@ while(1) # check that it doesn't already exist if(-f $conf) { - die "$conf already exists. Delete and try again" + die "$conf already exists. Delete and try again"; } # create directory @@ -110,7 +114,7 @@ if($#dirs == 0) { $dirs[1] = $dirs[0]; $dirs[2] = $dirs[0]; - print "WARNING: userland RAID is disabled.\n" + print "WARNING: userland RAID is disabled.\n"; } # write the file diff --git a/lib/raidfile/raidfile-config.in b/lib/raidfile/raidfile-config.in index f1098adc..76b65ace 100755 --- a/lib/raidfile/raidfile-config.in +++ b/lib/raidfile/raidfile-config.in @@ -16,14 +16,17 @@ Setup raidfile config utility. Bad command line parameters. Usage: - raidfile-config config-dir block-size dir0 [dir1 dir2] + raidfile-config config-dir block-size dir0 [dir1 dir2] -config-dir usually /etc/box -block-size must be a power of two, and usually the block or fragment size of your filing system -dir0, dir1, dir2 are the directories used as the root of the raid file system +Parameters: + config-dir is usually @sysconfdir_expanded@/box + block-size must be a power of two, and usually the block or + fragment size of your file system + dir0, dir1, dir2 are the directories used as the root of the raid + file system -If only one directory is specified, then userland RAID is disabled. Specifying three directories -enables it. +If only one directory is specified, then userland RAID is disabled. +Specifying three directories enables it. __E exit(1); @@ -57,7 +60,7 @@ while(1) # check that it doesn't already exist if(-f $conf) { - die "$conf already exists. Delete and try again" + die "$conf already exists. Delete and try again"; } # create directory @@ -72,7 +75,7 @@ if($#dirs == 0) { $dirs[1] = $dirs[0]; $dirs[2] = $dirs[0]; - print "WARNING: userland RAID is disabled.\n" + print "WARNING: userland RAID is disabled.\n"; } # write the file |