projects
/
matthijs
/
upstream
/
backupninja-vserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dup: document how to write sftp-compatible (and thus new-duplicity-compatible)
[matthijs/upstream/backupninja-vserver.git]
/
handlers
/
sys
diff --git
a/handlers/sys
b/handlers/sys
index a83baaafbcaaf1170c5c71fd20794a2efa890e9f..8059866cea70affe63b32cbc88f9a64b44614fa4 100755
(executable)
--- a/
handlers/sys
+++ b/
handlers/sys
@@
-37,7
+37,7
@@
if [ $os = "debian" ]
then
getconf packagesfile /var/backups/dpkg-selections.txt
getconf packagemgr `which dpkg`
then
getconf packagesfile /var/backups/dpkg-selections.txt
getconf packagemgr `which dpkg`
- getconf packagemgroptions " --get-selections"
+ getconf packagemgroptions " --get-selections
\*
"
elif [ $os = "redhat" ]
then
getconf packagesfile /var/backups/rpmpackages.txt
elif [ $os = "redhat" ]
then
getconf packagesfile /var/backups/rpmpackages.txt
@@
-93,7
+93,6
@@
if [ "$packages" == "yes" ]; then
nodpkg="$nodpkg|$vserver"
fi
else
nodpkg="$nodpkg|$vserver"
fi
else
- warning "vserver $vserver is not running, skipping installed packages report."
nodpkg="$nodpkg|$vserver"
fi
nodpkg="$nodpkg|$vserver"
fi
@@
-449,14
+448,17
@@
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=`$HWINFO --disk | grep "Device File" | cut -d\ -f5`
+ devices=`$SFDISK -l | grep "^Disk /dev" | cut -d/ -f2,3 | cut -d: -f1`
+ if [ "$devices" == "" ]; then
+ warning "No harddisks found"
+ fi
for dev in $devices; do
[ -b $dev ] || continue
label=${dev#/dev/}
label=${label//\//-}
outputfile=${partitionsfile//__star__/$label}
for dev in $devices; do
[ -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