From cb09049c18dfd3d2200d2951eaeedfd3fa1211ad Mon Sep 17 00:00:00 2001 From: Evan Dandrea Date: Thu, 19 Nov 2009 14:57:10 -0600 Subject: [PATCH] Import patches-unapplied version 1.102 to ubuntu/lucid Imported using git-ubuntu import. Changelog parent: 658b8ac3cc0b4b88c782e6b6ca9024cc5998c194 New changelog entries: * Don't output a newline in filesystem.size. --- debian/changelog | 6 ++++++ livecd.sh | 2 +- test | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 test diff --git a/debian/changelog b/debian/changelog index cbcc08b2..57a1b80f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (1.102) lucid; urgency=low + + * Don't output a newline in filesystem.size. + + -- Evan Dandrea Thu, 19 Nov 2009 14:57:10 -0600 + livecd-rootfs (0.101) lucid; urgency=low * Write out the total size of uncompressed squashfs to be used by diff --git a/livecd.sh b/livecd.sh index 22e9b645..6645b7c9 100755 --- a/livecd.sh +++ b/livecd.sh @@ -618,7 +618,7 @@ Pin-Priority: 550 # . However, we would like to cache this # number for partman's sufficient free space check and ubiquity's # installation progress calculation. - du -sx --block-size=1 ${ROOT} | cut -f1 > livecd.${FSS}.size || true + printf $(du -sx --block-size=1 ${ROOT} | cut -f1) > livecd.${FSS}.size || true livefs_squash() { diff --git a/test b/test new file mode 100644 index 00000000..e2a34b1b --- /dev/null +++ b/test @@ -0,0 +1 @@ +13168