projects
/
matthijs
/
upstream
/
backupninja.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6b015af
)
sys: start to fix silly output display and data loss
author
intrigeri
<intrigeri@boum.org>
Wed, 1 Nov 2006 21:14:35 +0000
(21:14 +0000)
committer
intrigeri
<intrigeri@boum.org>
Wed, 1 Nov 2006 21:14:35 +0000
(21:14 +0000)
ChangeLog
patch
|
blob
|
history
handlers/sys
patch
|
blob
|
history
diff --git
a/ChangeLog
b/ChangeLog
index 58414bad5947ebbf2d9e009bcbc983f91d3a108c..bd7c1aff05479e6107117124cb0ae3cda224796a 100644
(file)
--- a/
ChangeLog
+++ b/
ChangeLog
@@
-7,6
+7,7
@@
version 0.9.5 -- unreleased
sys:
. Fixed typo breaking things for VServers.
. Fix bug when vrootdir is on its own partition (Closes: #395928)
sys:
. Fixed typo breaking things for VServers.
. Fix bug when vrootdir is on its own partition (Closes: #395928)
+ . Hide silly sfdisk error output.
pgsql:
. Support configuring PGSQLUSER for real, and document it a bit
(Closes: #396578)
pgsql:
. Support configuring PGSQLUSER for real, and document it a bit
(Closes: #396578)
diff --git
a/handlers/sys
b/handlers/sys
index 677d5eee1b72ece94935c8e4fdf138b6a8fb88a9..7c31780e77f78753b98ef63cfc4b2049380ca307 100755
(executable)
--- a/
handlers/sys
+++ b/
handlers/sys
@@
-443,17
+443,19
@@
fi
# these files can be used to directly partition a disk of the same size.
if [ "$partitions" == "yes" ]; then
# these files can be used to directly partition a disk of the same size.
if [ "$partitions" == "yes" ]; then
- devices=`$SFDISK -l | grep "^Disk /dev" | cut -d/ -f2,3 | cut -d: -f1`
+ devices=`$SFDISK -l 2>/dev/null | grep "^Disk /dev" | awk '{print $2}' | cut -d: -f1`
+ debug "$SFDISK will try to backup partition tables for devices $devices"
if [ "$devices" == "" ]; then
warning "No harddisks found"
fi
for dev in $devices; do
if [ "$devices" == "" ]; then
warning "No harddisks found"
fi
for dev in $devices; do
+ debug "$SFDISK will try to backup partition tables for device $dev"
[ -b $dev ] || continue
label=${dev#/dev/}
label=${label//\//-}
outputfile=${partitionsfile//__star__/$label}
[ -b $dev ] || continue
label=${dev#/dev/}
label=${label//\//-}
outputfile=${partitionsfile//__star__/$label}
- debug "$SFDISK $sfdisk_options -d
/
$dev > $outputfile"
- $SFDISK $sfdisk_options -d
/
$dev > $outputfile
+ debug "$SFDISK $sfdisk_options -d $dev > $outputfile"
+ $SFDISK $sfdisk_options -d $dev > $outputfile
done
fi
done
fi