From b2cda6aae39c0f67999f4b8c9b4aee93c207287e Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Wed, 1 Nov 2006 21:14:35 +0000
Subject: [PATCH] sys: start to fix silly output display and data loss
---
ChangeLog | 1 +
handlers/sys | 8 +++++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 58414bad..bd7c1aff 100644
--- 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)
+ . Hide silly sfdisk error output.
pgsql:
. Support configuring PGSQLUSER for real, and document it a bit
(Closes: #396578)
diff --git a/handlers/sys b/handlers/sys
index 677d5eee..7c31780e 100755
--- 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
- 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
+ debug "$SFDISK will try to backup partition tables for device $dev"
[ -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
--
GitLab