1 files changed, 9 insertions, 18 deletions

diff --git a/rescue/make_rescue_img b/rescue/make_rescue_img
index 170bbcbd6..996025373 100755
--- a/rescue/make_rescue_img
+++ b/rescue/make_rescue_img
@@ -1,16 +1,14 @@
 #!/usr/bin/perl
 
 use MDK::Common;
-use lib "../perl-install";
+use lib "/usr/lib/libDrakX";
 use keyboard;
 
 my $lib = (arch() =~ /x86_64/ ? "lib64" : "lib");
 my $tmp = "/tmp/rescue_tmp";
-my $rescue = "rescue.clp";
+my $rescue = "rescue.sqfs";
 
-my $sudo = '';
 if ($>) {
-    $sudo = "sudo";
     $ENV{PATH} = "/sbin:/usr/sbin:$ENV{PATH}";
 }
 
@@ -28,7 +26,7 @@ sub installown($$) {
 sub install_perl_script {
     my ($script, $dir) = @_;
     my @gi_modules;
-    foreach (`../tools/get-needed-drakx-modules ../perl-install /usr/lib/libDrakX $script`) {
+    foreach (`../tools/get-needed-drakx-modules /usr/lib/libDrakX /usr/lib/libDrakX $script`) {
 	chomp;
 	my ($local, $dest) = split "\t";
 	installown($local, dirname($dest || $local));
@@ -38,24 +36,17 @@ sub install_perl_script {
     system('../tools/simplify-drakx-modules', @gi_modules, "$tmp$dir/$script");
 }
 
-_ "$sudo rm -rf $tmp" if -e $tmp;
+_ "rm -rf $tmp" if -e $tmp;
 _ "mkdir $tmp";
 _ 'find . -name "*~" | xargs rm -f';
 mkdir_p($tmp . chomp_($_)) foreach cat_("dirs");
 _ "cp -a tree/* $tmp";
-_ "find $tmp -name 'CVS*' | xargs rm -rf";
+_ "find $tmp -name .svn | xargs rm -rf";
 _ "perl devices.pl $tmp/dev";
 _ "mkfifo $tmp/dev/initctl";
 substInFile { s/DISTRIB_DESCR/$ENV{DISTRIB_DESCR}/ } "$tmp/etc/issue";
 
-{
-    _ "cd ../mdk-stage1 && make rescue-gui dhcp-client";
-    -e "../kernel/all.kernels" or die "use ./update_kernel in gi/kernel first\n";
-
-    $ENV{MAIN_KERNEL} = chomp_(`cat ../kernel/RPMS/.main`);
-
-    _ "../tools/install-xml-file-list list.xml $tmp";
-}
+_ "../tools/install-xml-file-list list.xml $tmp";
 
 my %keytable_conflicts;
 my @less_important_keytables = qw(am_old am_phonetic no-dvorak fr_CH-latin1);
@@ -111,8 +102,8 @@ EOF
     } "$tmp/etc/rc.sysinit";
 }
 
-_ "$sudo chown root.root -R $tmp/*";
-
 exit 0 if $ARGV[0];
 
-_ "mkisofs -quiet -D -R $tmp | create_compressed_fs - 65536 $rescue 200 2>/dev/null";
+_ "mksquashfs $tmp $rescue -all-root -noappend >/dev/null";
+_ "chmod 755 $rescue";
+_ "rm -rf $tmp";