summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-06-21 14:37:47 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-06-21 14:37:47 +0000
commitdf0f7fe03cdc33733f12555a520635bff429d6ee (patch)
tree6d5fd525d0b955b7ebb44b387f94c231190c39bd
parenta10096d569591324399f3ae1d4b7ce587bd04a27 (diff)
downloaddrakx-backup-do-not-use-df0f7fe03cdc33733f12555a520635bff429d6ee.tar
drakx-backup-do-not-use-df0f7fe03cdc33733f12555a520635bff429d6ee.tar.gz
drakx-backup-do-not-use-df0f7fe03cdc33733f12555a520635bff429d6ee.tar.bz2
drakx-backup-do-not-use-df0f7fe03cdc33733f12555a520635bff429d6ee.tar.xz
drakx-backup-do-not-use-df0f7fe03cdc33733f12555a520635bff429d6ee.zip
like live_tree_boot, one must handle live_tree_i18n_*
-rwxr-xr-xmove/tree/mdk_behind_totem16
-rwxr-xr-xmove/tree/mdk_totem6
2 files changed, 21 insertions, 1 deletions
diff --git a/move/tree/mdk_behind_totem b/move/tree/mdk_behind_totem
index eb7e859f1..028077821 100755
--- a/move/tree/mdk_behind_totem
+++ b/move/tree/mdk_behind_totem
@@ -4,6 +4,16 @@ ok=1
while [ -n "$1" ]; do
case "$1" in
+ --lang)
+ lang="$2"
+ shift
+ shift
+ ;;
+ --i18n-loop)
+ i18n_loop="$2"
+ shift
+ shift
+ ;;
--boot-loop)
boot_loop="$2"
shift
@@ -47,6 +57,9 @@ trap 'umount_cd' USR1
umount_cd() {
echo umount_cd
+ umount /image_i18n_$lang
+ losetup -d /dev/$i18n_loop
+
umount /image_boot
losetup -d /dev/$boot_loop
@@ -74,6 +87,9 @@ mount_cd() {
losetup -r -e gz /dev/$boot_loop /cdrom/live_tree_boot.clp
mount -r /dev/$boot_loop /image_boot
+ losetup -r -e gz /dev/$i18n_loop /cdrom/live_tree_i18n_$lang.clp
+ mount -r /dev/$i18n_loop /image_i18n_$lang
+
ln -sf /image/lib /
mdk_move_loop to_cdrom always always_i18n totem nvidia
diff --git a/move/tree/mdk_totem b/move/tree/mdk_totem
index a4544fca8..5fbda05f4 100755
--- a/move/tree/mdk_totem
+++ b/move/tree/mdk_totem
@@ -105,6 +105,7 @@ my %file2loop = do {
ugtk2::gtkset_mousecursor_normal(); #- for restoring a normal in any case
ugtk2::flush();
+my ($lang) = map { if_(/live_tree_i18n_(.*)\.clp/, $1) } keys %file2loop;
my $totem_pid = $$;
if (my $pid = fork()) {
@@ -112,7 +113,10 @@ if (my $pid = fork()) {
$ENV{G_BROKEN_FILENAMES} = 1;
exec 'totem';
} else {
- exec 'sudo', 'mdk_behind_totem',
+ exec 'sudo', 'mdk_behind_totem',
+ '--lang', $lang,
+ '--i18n-loop', $file2loop{"live_tree_i18n_$lang.clp"},
+ '--boot-loop', $file2loop{'live_tree_boot.clp'},
'--boot-loop', $file2loop{'live_tree_boot.clp'},
'--main-loop', $file2loop{'live_tree.clp'},
'--totem-pid', $totem_pid,