diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-06-24 13:20:39 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-06-24 13:20:39 +0200 |
| commit | 997291b8a6a66953c6a6270c2dda323769452581 (patch) | |
| tree | da24c0099caede14445289dca8d76560c08de1d9 /scripts/show-image-storage.pl | |
| parent | 3610a467094e80a39b6627f6b7655430917b9bd3 (diff) | |
| parent | add153b13de56f97624b2dc433fdbe21b36dbeed (diff) | |
| download | vyatta-op-lithium.tar.gz vyatta-op-lithium.zip | |
Merge branch 'current' into lithiumlithium
Conflicts:
Makefile.am
debian/changelog
templates/restart/dns/forwarding/node.def
templates/show/version/added/node.def
templates/show/version/all/node.def
templates/show/version/deleted/node.def
templates/show/version/downgraded/node.def
templates/show/version/node.def
templates/show/version/upgraded/node.def
Diffstat (limited to 'scripts/show-image-storage.pl')
| -rw-r--r-- | scripts/show-image-storage.pl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/show-image-storage.pl b/scripts/show-image-storage.pl index f8de35e..863b913 100644 --- a/scripts/show-image-storage.pl +++ b/scripts/show-image-storage.pl @@ -40,8 +40,8 @@ sub better_units { # # Figure out where the images live... -my $imagedir = "/live/image/boot"; -my $livecd = "/live/image/live"; +my $imagedir = "/lib/live/mount/persistence/boot"; +my $livecd = "/lib/live/mount/persistence/live"; if (! -e $imagedir) { if (-d $livecd) { die "System running on Live-CD\n"; @@ -73,11 +73,11 @@ foreach my $image (@bootlist_arr) { ($total, $garbage) = split(' ', $string); $total = better_units($total); - $string = `du -s -h $imagedir/$image --exclude live-rw`; + $string = `du -s -h $imagedir/$image --exclude rw`; ($read_only, $garbage) = split(' ', $string); $read_only = better_units($read_only); - $string = `du -s -h $imagedir/$image/live-rw`; + $string = `du -s -h $imagedir/$image/rw`; ($read_write, $garbage) = split(' ', $string); $read_write = better_units($read_write); |