Skip to content
Snippets Groups Projects
Commit 42b7be61 authored by intrigeri's avatar intrigeri
Browse files

sys: closes 396632 for real

parent b2cda6aa
Branches
Tags
No related merge requests found
...@@ -7,9 +7,12 @@ version 0.9.5 -- unreleased ...@@ -7,9 +7,12 @@ version 0.9.5 -- unreleased
sys: sys:
. Fixed typo breaking things for VServers. . Fixed typo breaking things for VServers.
. Fix bug when vrootdir is on its own partition (Closes: #395928) . Fix bug when vrootdir is on its own partition (Closes: #395928)
. Hide silly sfdisk error output. . Better sfdisk error and output handling: should now properly warn
when it does not manage to backup a partition table, and shut up when
it succeeds (Closes: #396632)
pgsql: pgsql:
. Support configuring PGSQLUSER for real, and document it a bit . Support configuring PGSQLUSER for real, and document it a bit; this
broken support actually prevented pgsql handler to work for VServers
(Closes: #396578) (Closes: #396578)
fixed automake 'make install' bug that failed if /etc/backup.d already fixed automake 'make install' bug that failed if /etc/backup.d already
existed existed
......
...@@ -444,7 +444,6 @@ fi ...@@ -444,7 +444,6 @@ fi
if [ "$partitions" == "yes" ]; then if [ "$partitions" == "yes" ]; then
devices=`$SFDISK -l 2>/dev/null | grep "^Disk /dev" | awk '{print $2}' | 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 if [ "$devices" == "" ]; then
warning "No harddisks found" warning "No harddisks found"
fi fi
...@@ -454,8 +453,11 @@ if [ "$partitions" == "yes" ]; then ...@@ -454,8 +453,11 @@ if [ "$partitions" == "yes" ]; then
label=${dev#/dev/} label=${dev#/dev/}
label=${label//\//-} label=${label//\//-}
outputfile=${partitionsfile//__star__/$label} outputfile=${partitionsfile//__star__/$label}
debug "$SFDISK $sfdisk_options -d $dev > $outputfile" debug "$SFDISK $sfdisk_options -d $dev > $outputfile 2>/dev/null"
$SFDISK $sfdisk_options -d $dev > $outputfile $SFDISK $sfdisk_options -d $dev > $outputfile 2>/dev/null
if [ $? -ne 0 ]; then
warning "The partition table for $dev could not be saved."
fi
done done
fi fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment