move /image_raw to /cdrom

6 files changed, 10 insertions, 12 deletions

diff --git a/mdk-stage1/config-stage1.h b/mdk-stage1/config-stage1.h
index 1962bf6f3..66e0140b1 100644
--- a/mdk-stage1/config-stage1.h
+++ b/mdk-stage1/config-stage1.h
@@ -34,10 +34,10 @@
 #ifdef MANDRAKE_MOVE
 #define MEM_LIMIT_MOVE 120
 #define DISTRIB_NAME "Mandrake Move"
-#define IMAGE_LOCATION   "/sysroot/image_raw"
+#define IMAGE_LOCATION   "/sysroot/cdrom"
 #define IMAGE_LOCATION_REAL "/sysroot/image"
 #define SLASH_LOCATION   "/sysroot"
-#define RAW_LOCATION_REL "/image_raw"
+#define RAW_LOCATION_REL "/cdrom"
 #define LIVE_LOCATION_REL "/image"
 #define BOOT_LOCATION "/sysroot/image_boot"
 #define ALWAYS_LOCATION "/sysroot/image_always"
diff --git a/move/move.pm b/move/move.pm
index a9fee7412..09b3e21de 100644
--- a/move/move.pm
+++ b/move/move.pm
@@ -118,12 +118,12 @@ drakx_stuff:
 
 sub lomount_clp {
     my ($name, $needed_file) = @_;
-    my ($clp, $dir) = ("/image_raw/live_tree_$name.clp", "/image_$name");
+    my ($clp, $dir) = ("/cdrom/live_tree_$name.clp", "/image_$name");
 
     -e "$dir$needed_file" and return;
 
     if (! -e $clp || cat_('/proc/cmdline') =~ /\blive\b/) {
-	symlink "/image_raw/live_tree_$name", $dir;
+	symlink "/cdrom/live_tree_$name", $dir;
 	return;
     }
 
diff --git a/move/todo b/move/todo
index 764bfb4b6..894fe1cb2 100644
--- a/move/todo
+++ b/move/todo
@@ -38,8 +38,6 @@ need to list things to remove in MCC (drakgw, etc -> things that
 have not the necessary packages and we don't want to provide)
 
 
-cd supermounted in /image_raw, not on desktop
-
 
         usb key
 
diff --git a/move/tools/busy-files b/move/tools/busy-files
index 5c770c561..7426e785a 100755
--- a/move/tools/busy-files
+++ b/move/tools/busy-files
@@ -13,13 +13,13 @@ my @l = map {
 push @l, grep { $_ } map { (split)[5] } map { cat_("/proc/$_/maps") } @pids;
 
 if ($ARGV[0] eq '--totem') {
-    @l = grep { m!/image(_boot|_raw)?/! } @l;
+    @l = grep { m!/(image(_boot)?|cdrom)/! } @l;
     $ARGV[0] = '--server';
 }
 foreach (uniq @l) {
     if ($ARGV[0] eq '--server') {
 	s!/image(_always|_boot|_totem)?/!/tmp/live_tree/!;
-	s!/image_raw/live_tree!/tmp/live_tree!;
+	s!/cdrom/live_tree!/tmp/live_tree!;
     }
     print "$_\n";
 }
diff --git a/move/tree/mdk_behind_totem b/move/tree/mdk_behind_totem
index 7aa5b68ca..82c065bf4 100755
--- a/move/tree/mdk_behind_totem
+++ b/move/tree/mdk_behind_totem
@@ -49,10 +49,10 @@ umount_cd() {
 
 mount_cd() {
     echo mount_cd
-    /image_always/sbin/losetup -r -e gz /dev/$main_loop /image_raw/live_tree.clp 
+    /image_always/sbin/losetup -r -e gz /dev/$main_loop /cdrom/live_tree.clp 
     /image_always/bin/mount /dev/$main_loop /image
 
-    losetup -r -e gz /dev/$boot_loop /image_raw/live_tree_boot.clp 
+    losetup -r -e gz /dev/$boot_loop /cdrom/live_tree_boot.clp 
     mount /dev/$boot_loop /image_boot
 
     ln -sf /image/lib /
diff --git a/move/tree/mdk_move_loop b/move/tree/mdk_move_loop
index 00158727d..b98c4a417 100755
--- a/move/tree/mdk_move_loop
+++ b/move/tree/mdk_move_loop
@@ -22,7 +22,7 @@ sub to_memory {
     if (-e "/$file") {
 	system("sudo mv /$file /tmp");
     } else {
-	system("sudo cp /image_raw/$file /tmp");
+	system("sudo cp /cdrom/$file /tmp");
     }
     system("sudo losetup /dev/$loop /tmp/$file");
 }
@@ -30,7 +30,7 @@ sub to_memory {
 sub to_cdrom {
     my ($loop, $file) = @_;
     my $f = -e "/$file" ? "/$file" : -e "/tmp/$file" ? "/tmp/$file" : return;
-    system("sudo losetup /dev/$loop /image_raw/$file");
+    system("sudo losetup /dev/$loop /cdrom/$file");
     system("sudo rm $f");
 }