Module Name: src
Committed By: christos
Date: Sat Jan 7 18:54:31 UTC 2012
Modified Files:
src/distrib/utils/sysinst: aout2elf.c msg.mi.de msg.mi.en msg.mi.es
msg.mi.fr msg.mi.pl upgrade.c
Log Message:
only deal with X11R7 now.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/distrib/utils/sysinst/aout2elf.c
cvs rdiff -u -r1.57 -r1.58 src/distrib/utils/sysinst/msg.mi.de
cvs rdiff -u -r1.165 -r1.166 src/distrib/utils/sysinst/msg.mi.en
cvs rdiff -u -r1.35 -r1.36 src/distrib/utils/sysinst/msg.mi.es
cvs rdiff -u -r1.115 -r1.116 src/distrib/utils/sysinst/msg.mi.fr
cvs rdiff -u -r1.74 -r1.75 src/distrib/utils/sysinst/msg.mi.pl
cvs rdiff -u -r1.51 -r1.52 src/distrib/utils/sysinst/upgrade.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/aout2elf.c
diff -u src/distrib/utils/sysinst/aout2elf.c:1.17 src/distrib/utils/sysinst/aout2elf.c:1.18
--- src/distrib/utils/sysinst/aout2elf.c:1.17 Fri Sep 16 11:42:28 2011
+++ src/distrib/utils/sysinst/aout2elf.c Sat Jan 7 13:54:30 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: aout2elf.c,v 1.17 2011/09/16 15:42:28 joerg Exp $
+/* $NetBSD: aout2elf.c,v 1.18 2012/01/07 18:54:30 christos Exp $
*
* Copyright 1997 Piermont Information Systems Inc.
* All rights reserved.
@@ -287,11 +287,11 @@ domove:
n = handle_aout_libs(src, LIB_MOVE, concat_paths(prefix, "usr/lib"));
if (run_program(0, "mkdir -p %s ",
- concat_paths(prefix, "usr/X11R6/lib")))
+ concat_paths(prefix, "usr/X11R7/lib")))
abort_libupdate();
- strlcpy(src, target_expand("/usr/X11R6/lib"), sizeof(src));
- handle_aout_x_libs(src, concat_paths(prefix, "usr/X11R6/lib"));
+ strlcpy(src, target_expand("/usr/X11R7/lib"), sizeof(src));
+ handle_aout_x_libs(src, concat_paths(prefix, "usr/X11R7/lib"));
if (backedup) {
msg_display(MSG_emulbackup);
Index: src/distrib/utils/sysinst/msg.mi.de
diff -u src/distrib/utils/sysinst/msg.mi.de:1.57 src/distrib/utils/sysinst/msg.mi.de:1.58
--- src/distrib/utils/sysinst/msg.mi.de:1.57 Sun Apr 17 08:33:42 2011
+++ src/distrib/utils/sysinst/msg.mi.de Sat Jan 7 13:54:30 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.de,v 1.57 2011/04/17 12:33:42 martin Exp $ */
+/* $NetBSD: msg.mi.de,v 1.58 2012/01/07 18:54:30 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -677,17 +677,17 @@ Aktualisierung wird abgebrochen.
}
message X_oldexists
-{Der alte X Server /usr/X11R6/bin/X kann nicht als /usr/X11R6/bin/X.old
+{Der alte X Server /usr/X11R7/bin/X kann nicht als /usr/X11R7/bin/X.old
gesichert werden, da eine Datei mit diesem Namen bereits existiert.
Bitte korrigieren Sie dies, bevor Sie fortfahren.
Eine M�glichkeit ist es, im Extras-Men� eine Shell zu starten,
-wodurch Sie /usr/X11R6/bin/X.old �berpr�fen k�nnen. Geh�rt diese Datei zu
+wodurch Sie /usr/X11R7/bin/X.old �berpr�fen k�nnen. Geh�rt diese Datei zu
einer fr�heren Aktualisierung, so k�nnen Sie diese mit rm -f
-/usr/X11R6/bin/x.old l�schen und danach die Aktualisierung neu starten.
-Geh�rt die Datei /usr/X11R6/bin/X.old aber zu einer aktuellen,
-abgebrochenen Aktualisierung, so k�nnen Sie die Datei /usr/X11R6/bin/X mit
-mv /usr/X11R6/bin/X.old /usr/X11R6/bin/X wieder herstellen und die
+/usr/X11R7/bin/x.old l�schen und danach die Aktualisierung neu starten.
+Geh�rt die Datei /usr/X11R7/bin/X.old aber zu einer aktuellen,
+abgebrochenen Aktualisierung, so k�nnen Sie die Datei /usr/X11R7/bin/X mit
+mv /usr/X11R7/bin/X.old /usr/X11R7/bin/X wieder herstellen und die
unvollst�ndige Aktualisierung fortsetzen.
Aktualisierung wird abgebrochen.}
Index: src/distrib/utils/sysinst/msg.mi.en
diff -u src/distrib/utils/sysinst/msg.mi.en:1.165 src/distrib/utils/sysinst/msg.mi.en:1.166
--- src/distrib/utils/sysinst/msg.mi.en:1.165 Sun Apr 17 08:33:42 2011
+++ src/distrib/utils/sysinst/msg.mi.en Sat Jan 7 13:54:30 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.en,v 1.165 2011/04/17 12:33:42 martin Exp $ */
+/* $NetBSD: msg.mi.en,v 1.166 2012/01/07 18:54:30 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -649,16 +649,16 @@ message badetcfstab
}
message X_oldexists
-{I cannot save /usr/X11R6/bin/X as /usr/X11R6/bin/X.old, because the
-target disk already has an /usr/X11R6/bin/X.old. Please fix this before
+{I cannot save /usr/X11R7/bin/X as /usr/X11R7/bin/X.old, because the
+target disk already has an /usr/X11R7/bin/X.old. Please fix this before
continuing.
One way is to start a shell from the Utilities menu, examine the
-target /usr/X11R6/bin/X and /usr/X11R6/bin/X.old. If
-/usr/X11R6/bin/X.old is from a completed upgrade, you can rm -f
-/usr/X11R6/bin/X.old and restart. Or if /usr/X11R6/bin/X.old is from
-a recent, incomplete upgrade, you can rm -f /usr/X11R6/bin/X and mv
-/usr/X11R6/bin/X.old to /usr/X11R6/bin/X.
+target /usr/X11R7/bin/X and /usr/X11R7/bin/X.old. If
+/usr/X11R7/bin/X.old is from a completed upgrade, you can rm -f
+/usr/X11R7/bin/X.old and restart. Or if /usr/X11R7/bin/X.old is from
+a recent, incomplete upgrade, you can rm -f /usr/X11R7/bin/X and mv
+/usr/X11R7/bin/X.old to /usr/X11R7/bin/X.
Aborting upgrade.}
Index: src/distrib/utils/sysinst/msg.mi.es
diff -u src/distrib/utils/sysinst/msg.mi.es:1.35 src/distrib/utils/sysinst/msg.mi.es:1.36
--- src/distrib/utils/sysinst/msg.mi.es:1.35 Sun Apr 17 08:33:42 2011
+++ src/distrib/utils/sysinst/msg.mi.es Sat Jan 7 13:54:30 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.es,v 1.35 2011/04/17 12:33:42 martin Exp $ */
+/* $NetBSD: msg.mi.es,v 1.36 2012/01/07 18:54:30 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -669,16 +669,16 @@ Interrumpiendo la actualizaci�n.
}
message X_oldexists
-{No se puede guardar /usr/X11R6/bin/X como /usr/X11R6/bin/X.old, porque el
-disco objetivo ya tiene un /usr/X11R6/bin/X.old. Por favor, arregle esto
+{No se puede guardar /usr/X11R7/bin/X como /usr/X11R7/bin/X.old, porque el
+disco objetivo ya tiene un /usr/X11R7/bin/X.old. Por favor, arregle esto
antes de continuar.
Una manera es iniciando una shell desde el men� Utilidades, y examinar
-el objetivo /usr/X11R6/bin/X y /usr/X11R6/bin/X.old. Si
-/usr/X11R6/bin/X.old es de una actualizaci�n completada, puede rm -f
-/usr/X11R6/bin/X.old y reiniciar. O si /usr/X11R6/bin/X.old es de
-una actualizacion reciente e incompleta, puede rm -f /usr/X11R6/bin/X
-y mv /usr/X11R6/bin/X.old a /usr/X11R6/bin/X.
+el objetivo /usr/X11R7/bin/X y /usr/X11R7/bin/X.old. Si
+/usr/X11R7/bin/X.old es de una actualizaci�n completada, puede rm -f
+/usr/X11R7/bin/X.old y reiniciar. O si /usr/X11R7/bin/X.old es de
+una actualizacion reciente e incompleta, puede rm -f /usr/X11R7/bin/X
+y mv /usr/X11R7/bin/X.old a /usr/X11R7/bin/X.
Interrumpiendo la actualizaci�n.}
Index: src/distrib/utils/sysinst/msg.mi.fr
diff -u src/distrib/utils/sysinst/msg.mi.fr:1.115 src/distrib/utils/sysinst/msg.mi.fr:1.116
--- src/distrib/utils/sysinst/msg.mi.fr:1.115 Sun Apr 17 08:33:42 2011
+++ src/distrib/utils/sysinst/msg.mi.fr Sat Jan 7 13:54:31 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.fr,v 1.115 2011/04/17 12:33:42 martin Exp $ */
+/* $NetBSD: msg.mi.fr,v 1.116 2012/01/07 18:54:31 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -703,16 +703,16 @@ Ceci est une erreur majeure : nous ne po
message X_oldexists
{
-Impossible de sauvegarder /usr/X11R6/bin/X : le disque contient d�j�
-un fichier /usr/X11R6/bin/X.old et nous devons renommer l'actuel fichier
+Impossible de sauvegarder /usr/X11R7/bin/X : le disque contient d�j�
+un fichier /usr/X11R7/bin/X.old et nous devons renommer l'actuel fichier
avec ce nom. Veuillez supprimer ou renommer le fichier X.old avant de
recommencer.
Vous pouvez d�marrer un shell depuis le menu "Utilitaires" afin
de faire cette modification.
Ce fichier provient probablement d'une ancienne mise � jour et
il est possible de le supprimer. S'il provient d'une mise � jour
-incompl�te, vous pouvez effacer /usr/X11R6/bin/X et renommer
-/usr/X11R6/bin/X.old en /usr/X11R6/bin/X.
+incompl�te, vous pouvez effacer /usr/X11R7/bin/X et renommer
+/usr/X11R7/bin/X.old en /usr/X11R7/bin/X.
Arr�t de la mise � jour.
}
Index: src/distrib/utils/sysinst/msg.mi.pl
diff -u src/distrib/utils/sysinst/msg.mi.pl:1.74 src/distrib/utils/sysinst/msg.mi.pl:1.75
--- src/distrib/utils/sysinst/msg.mi.pl:1.74 Sun Apr 17 08:33:42 2011
+++ src/distrib/utils/sysinst/msg.mi.pl Sat Jan 7 13:54:31 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.pl,v 1.74 2011/04/17 12:33:42 martin Exp $ */
+/* $NetBSD: msg.mi.pl,v 1.75 2012/01/07 18:54:31 christos Exp $ */
/* Based on english version: */
/* NetBSD: msg.mi.pl,v 1.36 2004/04/17 18:55:35 atatat Exp */
@@ -648,15 +648,15 @@ message badetcfstab
}
message X_oldexists
-{Nie moge zapisac /usr/X11R6/bin/X jako /usr/X11R6/bin/X.old, poniewaz
-na docelowym dysku jest juz /usr/X11R6/bin/X.old. Napraw to przed kontynuacja.
+{Nie moge zapisac /usr/X11R7/bin/X jako /usr/X11R7/bin/X.old, poniewaz
+na docelowym dysku jest juz /usr/X11R7/bin/X.old. Napraw to przed kontynuacja.
Jedyny sposob to uruchomic powloke z menu Narzedziowego i sprawdzic
-docelowe /usr/X11R6/bin/X oraz /usr/X11R6/bin/X.old. Jesli
-/usr/X11R6/bin/X.old pochodzi z zakonczonej aktualizacji, mozesz usunac
-/usr/X11R6/bin/X.old i zrobic restart. Albo jesli /usr/X11R6/bin/X.old
+docelowe /usr/X11R7/bin/X oraz /usr/X11R7/bin/X.old. Jesli
+/usr/X11R7/bin/X.old pochodzi z zakonczonej aktualizacji, mozesz usunac
+/usr/X11R7/bin/X.old i zrobic restart. Albo jesli /usr/X11R7/bin/X.old
pochodzi z aktualnej niekompletnej aktualizacji, mozesz usunac
-/usr/X11R6/bin/X i przeniesc /usr/X11R6/bin/X.old na /usr/X11R6/bin/X.
+/usr/X11R7/bin/X i przeniesc /usr/X11R7/bin/X.old na /usr/X11R7/bin/X.
Przerywamy aktualizacje.}
Index: src/distrib/utils/sysinst/upgrade.c
diff -u src/distrib/utils/sysinst/upgrade.c:1.51 src/distrib/utils/sysinst/upgrade.c:1.52
--- src/distrib/utils/sysinst/upgrade.c:1.51 Mon Apr 4 04:30:14 2011
+++ src/distrib/utils/sysinst/upgrade.c Sat Jan 7 13:54:31 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: upgrade.c,v 1.51 2011/04/04 08:30:14 mbalmer Exp $ */
+/* $NetBSD: upgrade.c,v 1.52 2012/01/07 18:54:31 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -112,20 +112,20 @@ static int
save_X(void)
{
/* Only care for X if it's a symlink */
- if (target_symlink_exists_p("/usr/X11R6/bin/X")) {
- if (target_symlink_exists_p("/usr/X11R6/bin/X.old")) {
+ if (target_symlink_exists_p("/usr/X11R7/bin/X")) {
+ if (target_symlink_exists_p("/usr/X11R7/bin/X.old")) {
msg_display(MSG_X_oldexists);
process_menu(MENU_ok, NULL);
return EEXIST;
}
#ifdef DEBUG
- printf("saving /usr/X11R6/bin/X as .../X.old ...");
+ printf("saving /usr/X11R7/bin/X as .../X.old ...");
#endif
/* Move target .../X to .../X.old. Abort on error. */
- mv_within_target_or_die("/usr/X11R6/bin/X",
- "/usr/X11R6/bin/X.old");
+ mv_within_target_or_die("/usr/X11R7/bin/X",
+ "/usr/X11R7/bin/X.old");
}
return 0;
@@ -138,11 +138,11 @@ save_X(void)
static int
merge_X(void)
{
- if (target_symlink_exists_p("/usr/X11R6/bin/X.old")) {
+ if (target_symlink_exists_p("/usr/X11R7/bin/X.old")) {
/* Only move back X if it's a symlink - we don't want
* to restore old binaries */
- mv_within_target_or_die("/usr/X11R6/bin/X.old",
- "/usr/X11R6/bin/X");
+ mv_within_target_or_die("/usr/X11R7/bin/X.old",
+ "/usr/X11R7/bin/X");
}
return 0;
