diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2006-02-28 16:17:17 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2006-02-28 16:17:17 +0000 |
| commit | 797ad79963ace8f37b1ebfe3e25c3ee8fe1edd34 (patch) | |
| tree | abe4ac7cc137e1d1082af80bd14cdf02f23a9ec1 | |
| parent | b46050ae35f12f12abd9390c2d40e15ef828ee79 (diff) | |
| download | drakx-797ad79963ace8f37b1ebfe3e25c3ee8fe1edd34.tar drakx-797ad79963ace8f37b1ebfe3e25c3ee8fe1edd34.tar.gz drakx-797ad79963ace8f37b1ebfe3e25c3ee8fe1edd34.tar.bz2 drakx-797ad79963ace8f37b1ebfe3e25c3ee8fe1edd34.tar.xz drakx-797ad79963ace8f37b1ebfe3e25c3ee8fe1edd34.zip | |
simplify (since partimage_whole_disk rest_all doesn't handle multi dirs anymore)
| -rwxr-xr-x | rescue/make_rescue_img | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/rescue/make_rescue_img b/rescue/make_rescue_img index a7d690101..952ad942d 100755 --- a/rescue/make_rescue_img +++ b/rescue/make_rescue_img @@ -91,9 +91,6 @@ if ($ENV{PARTIMAGE_RPM}) { my $default_dir = '/data/box'; my $partimage_dir = $ENV{PARTIMAGE_DIR} || $default_dir; - my @local_dirs = map { "/tmp/image$_" } split(' ', $partimage_dir); - my $local_dir = $local_dirs[0]; - my $local_dirs = join(' ', @local_dirs); substInFile { $_ = <<EOF if /^\s*rescue-gui/; @@ -101,8 +98,8 @@ if ($ENV{PARTIMAGE_RPM}) { partimage_whole_disk -s $server save_all $default_dir fi if grep -q rest_all /proc/cmdline; then - if [ -d $local_dir ]; then - partimage_whole_disk rest_all $local_dirs + if [ -d /tmp/image$partimage_dir ]; then + partimage_whole_disk rest_all /tmp/image$partimage_dir else partimage_whole_disk -s $server rest_all $partimage_dir fi |