diff -Nru partman-partitioning-114ubuntu2/debian/changelog partman-partitioning-114ubuntu3/debian/changelog --- partman-partitioning-114ubuntu2/debian/changelog 2017-01-12 07:37:31.000000000 -0500 +++ partman-partitioning-114ubuntu3/debian/changelog 2018-02-05 12:34:14.000000000 -0500 @@ -1,3 +1,10 @@ +partman-partitioning (114ubuntu3) artful; urgency=medium + + * Make get_real_device() both simpler and more generic. + (LP: #1733276) (Closes: #820818). + + -- Eric Desrochers Mon, 05 Feb 2018 12:12:45 -0500 + partman-partitioning (114ubuntu2) zesty; urgency=medium * DASD-FBA drives should still use msdos partition table, and not dasd diff -Nru partman-partitioning-114ubuntu2/lib/resize.sh partman-partitioning-114ubuntu3/lib/resize.sh --- partman-partitioning-114ubuntu2/lib/resize.sh 2016-11-16 11:16:57.000000000 -0500 +++ partman-partitioning-114ubuntu3/lib/resize.sh 2018-02-05 12:12:44.000000000 -0500 @@ -19,15 +19,12 @@ num=$(sed 's/^[^0-9]*\([0-9]*\)[^0-9].*/\1/' $backupdev/$oldid/view) bdev=$(cat $backupdev/device) case $bdev in - */disc) - bdev=${bdev%/disc}/part$num + /dev/*[0-9]) + bdev=${bdev}p$num ;; - /dev/[hsv]d[a-z]|/dev/xvd[a-z]) + /dev/*) bdev=$bdev$num ;; - /dev/cciss/c[0-9]d[0-9]|/dev/cciss/c[0-9]d[0-9][0-9]|/dev/ida/c[0-9]d[0-9]|/dev/ida/c[0-9]d[0-9][0-9]|/dev/mmcblk[0-9]) - bdev=${bdev}p$num - ;; *) log "get_real_device: strange device name $bdev" return