Revision: 2758
http://ipcop.svn.sourceforge.net/ipcop/?rev=2758&view=rev
Author: gespinasse
Date: 2009-04-30 23:46:39 +0000 (Thu, 30 Apr 2009)
Log Message:
-----------
Finally raid1 work on sparc, even in pure(all partitions) as raid1
This is not much documented but that work.
Let make_bootable function return a status
This allow to detect when bootloaded installation fail.
This was the case for sparc raid1 but return value was not tested.
Test is now done for all arch.
raid1 need -t flag for silo or it fail
Fix copy/past error for raid1 s/md1/md0/
Really do what the comment announce : set the boot devices from installer.
This only work with hdx and sdx and will not work with cciss and mmcblk.
I didn't care to calculate device string lenght in that case and don't know how
it is counted by obp
Even unsure if those two controllers are available on sparch machines.
Modified Paths:
--------------
ipcop/trunk/langs/af_ZA/install.po
ipcop/trunk/langs/bg_BG/install.po
ipcop/trunk/langs/ca_ES/install.po
ipcop/trunk/langs/cs_CZ/install.po
ipcop/trunk/langs/da_DK/install.po
ipcop/trunk/langs/de_DE/install.po
ipcop/trunk/langs/el_GR/install.po
ipcop/trunk/langs/en_GB/install.po
ipcop/trunk/langs/es_ES/install.po
ipcop/trunk/langs/es_UY/install.po
ipcop/trunk/langs/fa_IR/install.po
ipcop/trunk/langs/fi_FI/install.po
ipcop/trunk/langs/fr_FR/install.po
ipcop/trunk/langs/gu_IN/install.po
ipcop/trunk/langs/hu_HU/install.po
ipcop/trunk/langs/install.new.en.pl
ipcop/trunk/langs/it_IT/install.po
ipcop/trunk/langs/ja_JP/install.po
ipcop/trunk/langs/lt_LT/install.po
ipcop/trunk/langs/nb_NO/install.po
ipcop/trunk/langs/nl_NL/install.po
ipcop/trunk/langs/pl_PL/install.po
ipcop/trunk/langs/pt_BR/install.po
ipcop/trunk/langs/pt_PT/install.po
ipcop/trunk/langs/ro_RO/install.po
ipcop/trunk/langs/ru_RU/install.po
ipcop/trunk/langs/sk_SK/install.po
ipcop/trunk/langs/sl_SI/install.po
ipcop/trunk/langs/so_SO/install.po
ipcop/trunk/langs/sv_SE/install.po
ipcop/trunk/langs/th_TH/install.po
ipcop/trunk/langs/tr_TR/install.po
ipcop/trunk/langs/ur_PK/install.po
ipcop/trunk/langs/vi_VN/install.po
ipcop/trunk/langs/zh_CN/install.po
ipcop/trunk/langs/zh_TW/install.po
ipcop/trunk/src/installer/partition.c
Modified: ipcop/trunk/langs/af_ZA/install.po
===================================================================
--- ipcop/trunk/langs/af_ZA/install.po 2009-04-30 23:13:29 UTC (rev 2757)
+++ ipcop/trunk/langs/af_ZA/install.po 2009-04-30 23:46:39 UTC (rev 2758)
@@ -41,6 +41,9 @@
msgstr "Assign"
msgid "TR_BACKUP_PASSWORD"
msgstr "'backup' wagwoord"
+#### NEW:
+msgid "TR_BOOTLOADER_INSTALLATION_ERROR"
+msgstr "Bootloader installation error"
msgid "TR_BUILDING_INITRD"
msgstr "Building INITRD..."
msgid "TR_CANCEL"
Modified: ipcop/trunk/langs/bg_BG/install.po
===================================================================
--- ipcop/trunk/langs/bg_BG/install.po 2009-04-30 23:13:29 UTC (rev 2757)
+++ ipcop/trunk/langs/bg_BG/install.po 2009-04-30 23:46:39 UTC (rev 2758)
@@ -40,6 +40,9 @@
msgstr "Assign"
msgid "TR_BACKUP_PASSWORD"
msgstr "'backup' password"
+#### NEW:
+msgid "TR_BOOTLOADER_INSTALLATION_ERROR"
+msgstr "Bootloader installation error"
msgid "TR_BUILDING_INITRD"
msgstr "Building INITRD..."
msgid "TR_CANCEL"
Modified: ipcop/trunk/langs/ca_ES/install.po
===================================================================
--- ipcop/trunk/langs/ca_ES/install.po 2009-04-30 23:13:29 UTC (rev 2757)
+++ ipcop/trunk/langs/ca_ES/install.po 2009-04-30 23:46:39 UTC (rev 2758)
@@ -40,6 +40,9 @@
msgstr "Assign"
msgid "TR_BACKUP_PASSWORD"
msgstr "Contrasenya de 'backup'"
+#### NEW:
+msgid "TR_BOOTLOADER_INSTALLATION_ERROR"
+msgstr "Bootloader installation error"
msgid "TR_BUILDING_INITRD"
msgstr "Building INITRD..."
msgid "TR_CANCEL"
Modified: ipcop/trunk/langs/cs_CZ/install.po
===================================================================
--- ipcop/trunk/langs/cs_CZ/install.po 2009-04-30 23:13:29 UTC (rev 2757)
+++ ipcop/trunk/langs/cs_CZ/install.po 2009-04-30 23:46:39 UTC (rev 2758)
@@ -40,6 +40,9 @@
msgstr "Assign"
msgid "TR_BACKUP_PASSWORD"
msgstr "Heslo uživatele 'backup'"
+#### NEW:
+msgid "TR_BOOTLOADER_INSTALLATION_ERROR"
+msgstr "Bootloader installation error"
msgid "TR_BUILDING_INITRD"
msgstr "Vytvářím INITRD..."
msgid "TR_CANCEL"
Modified: ipcop/trunk/langs/da_DK/install.po
===================================================================
--- ipcop/trunk/langs/da_DK/install.po 2009-04-30 23:13:29 UTC (rev 2757)
+++ ipcop/trunk/langs/da_DK/install.po 2009-04-30 23:46:39 UTC (rev 2758)
@@ -41,6 +41,9 @@
msgstr "Assign"
msgid "TR_BACKUP_PASSWORD"
msgstr "'backup' password"
+#### NEW:
+msgid "TR_BOOTLOADER_INSTALLATION_ERROR"
+msgstr "Bootloader installation error"
msgid "TR_BUILDING_INITRD"
msgstr "Bygger INITRD..."
msgid "TR_CANCEL"
Modified: ipcop/trunk/langs/de_DE/install.po
===================================================================
--- ipcop/trunk/langs/de_DE/install.po 2009-04-30 23:13:29 UTC (rev 2757)
+++ ipcop/trunk/langs/de_DE/install.po 2009-04-30 23:46:39 UTC (rev 2758)
@@ -42,6 +42,9 @@
msgstr "Assign"
msgid "TR_BACKUP_PASSWORD"
msgstr "'backup'-Passwort"
+#### NEW:
+msgid "TR_BOOTLOADER_INSTALLATION_ERROR"
+msgstr "Bootloader installation error"
msgid "TR_BUILDING_INITRD"
msgstr "Erzeuge INITRD..."
msgid "TR_CANCEL"
Modified: ipcop/trunk/langs/el_GR/install.po
===================================================================
--- ipcop/trunk/langs/el_GR/install.po 2009-04-30 23:13:29 UTC (rev 2757)
+++ ipcop/trunk/langs/el_GR/install.po 2009-04-30 23:46:39 UTC (rev 2758)
@@ -40,6 +40,9 @@
msgstr "Assign"
msgid "TR_BACKUP_PASSWORD"
msgstr "κωδικός πρόσβασης 'backup'"
+#### NEW:
+msgid "TR_BOOTLOADER_INSTALLATION_ERROR"
+msgstr "Bootloader installation error"
msgid "TR_BUILDING_INITRD"
msgstr "Δημιουργία INITRD..."
msgid "TR_CANCEL"
Modified: ipcop/trunk/langs/en_GB/install.po
===================================================================
--- ipcop/trunk/langs/en_GB/install.po 2009-04-30 23:13:29 UTC (rev 2757)
+++ ipcop/trunk/langs/en_GB/install.po 2009-04-30 23:46:39 UTC (rev 2758)
@@ -38,6 +38,9 @@
msgstr "Assign"
msgid "TR_BACKUP_PASSWORD"
msgstr "'backup' password"
+#### NEW:
+msgid "TR_BOOTLOADER_INSTALLATION_ERROR"
+msgstr "Bootloader installation error"
msgid "TR_BUILDING_INITRD"
msgstr "Building INITRD..."
msgid "TR_CANCEL"
Modified: ipcop/trunk/langs/es_ES/install.po
===================================================================
--- ipcop/trunk/langs/es_ES/install.po 2009-04-30 23:13:29 UTC (rev 2757)
+++ ipcop/trunk/langs/es_ES/install.po 2009-04-30 23:46:39 UTC (rev 2758)
@@ -42,6 +42,9 @@
msgstr "Assign"
msgid "TR_BACKUP_PASSWORD"
msgstr "Contraseña de 'backup'"
+#### NEW:
+msgid "TR_BOOTLOADER_INSTALLATION_ERROR"
+msgstr "Bootloader installation error"
msgid "TR_BUILDING_INITRD"
msgstr "Generando INITRD..."
msgid "TR_CANCEL"
Modified: ipcop/trunk/langs/es_UY/install.po
===================================================================
--- ipcop/trunk/langs/es_UY/install.po 2009-04-30 23:13:29 UTC (rev 2757)
+++ ipcop/trunk/langs/es_UY/install.po 2009-04-30 23:46:39 UTC (rev 2758)
@@ -40,6 +40,9 @@
msgstr "Assign"
msgid "TR_BACKUP_PASSWORD"
msgstr "Contraseña de usuario 'backup'"
+#### NEW:
+msgid "TR_BOOTLOADER_INSTALLATION_ERROR"
+msgstr "Bootloader installation error"
msgid "TR_BUILDING_INITRD"
msgstr "Creando INITRD..."
msgid "TR_CANCEL"
Modified: ipcop/trunk/langs/fa_IR/install.po
===================================================================
--- ipcop/trunk/langs/fa_IR/install.po 2009-04-30 23:13:29 UTC (rev 2757)
+++ ipcop/trunk/langs/fa_IR/install.po 2009-04-30 23:46:39 UTC (rev 2758)
@@ -40,6 +40,9 @@
msgstr "Assign"
msgid "TR_BACKUP_PASSWORD"
msgstr "'backup' password"
+#### NEW:
+msgid "TR_BOOTLOADER_INSTALLATION_ERROR"
+msgstr "Bootloader installation error"
msgid "TR_BUILDING_INITRD"
msgstr "Building INITRD..."
msgid "TR_CANCEL"
Modified: ipcop/trunk/langs/fi_FI/install.po
===================================================================
--- ipcop/trunk/langs/fi_FI/install.po 2009-04-30 23:13:29 UTC (rev 2757)
+++ ipcop/trunk/langs/fi_FI/install.po 2009-04-30 23:46:39 UTC (rev 2758)
@@ -40,6 +40,9 @@
msgstr "Assign"
msgid "TR_BACKUP_PASSWORD"
msgstr "'backup' salasana"
+#### NEW:
+msgid "TR_BOOTLOADER_INSTALLATION_ERROR"
+msgstr "Bootloader installation error"
msgid "TR_BUILDING_INITRD"
msgstr "Tallennetaan INITRD..."
msgid "TR_CANCEL"
Modified: ipcop/trunk/langs/fr_FR/install.po
===================================================================
--- ipcop/trunk/langs/fr_FR/install.po 2009-04-30 23:13:29 UTC (rev 2757)
+++ ipcop/trunk/langs/fr_FR/install.po 2009-04-30 23:46:39 UTC (rev 2758)
@@ -43,6 +43,9 @@
msgstr "Assign"
msgid "TR_BACKUP_PASSWORD"
msgstr "Mot de passe 'backup'"
+#### NEW:
+msgid "TR_BOOTLOADER_INSTALLATION_ERROR"
+msgstr "Bootloader installation error"
msgid "TR_BUILDING_INITRD"
msgstr "INITRD en préparation..."
msgid "TR_CANCEL"
Modified: ipcop/trunk/langs/gu_IN/install.po
===================================================================
--- ipcop/trunk/langs/gu_IN/install.po 2009-04-30 23:13:29 UTC (rev 2757)
+++ ipcop/trunk/langs/gu_IN/install.po 2009-04-30 23:46:39 UTC (rev 2758)
@@ -40,6 +40,9 @@
msgstr "Assign"
msgid "TR_BACKUP_PASSWORD"
msgstr "'backup' password"
+#### NEW:
+msgid "TR_BOOTLOADER_INSTALLATION_ERROR"
+msgstr "Bootloader installation error"
msgid "TR_BUILDING_INITRD"
msgstr "Building INITRD..."
msgid "TR_CANCEL"
Modified: ipcop/trunk/langs/hu_HU/install.po
===================================================================
--- ipcop/trunk/langs/hu_HU/install.po 2009-04-30 23:13:29 UTC (rev 2757)
+++ ipcop/trunk/langs/hu_HU/install.po 2009-04-30 23:46:39 UTC (rev 2758)
@@ -41,6 +41,9 @@
msgstr "Assign"
msgid "TR_BACKUP_PASSWORD"
msgstr "'backup' jelszó"
+#### NEW:
+msgid "TR_BOOTLOADER_INSTALLATION_ERROR"
+msgstr "Bootloader installation error"
msgid "TR_BUILDING_INITRD"
msgstr "INITRD felépítése..."
msgid "TR_CANCEL"
Modified: ipcop/trunk/langs/install.new.en.pl
===================================================================
--- ipcop/trunk/langs/install.new.en.pl 2009-04-30 23:13:29 UTC (rev 2757)
+++ ipcop/trunk/langs/install.new.en.pl 2009-04-30 23:46:39 UTC (rev 2758)
@@ -16,6 +16,7 @@
'TR_ASSIGN' => 'Assign',
'TR_BACKUP_PASSWORD' => '\'backup\' password',
'TR_BUILDING_INITRD' => 'Building INITRD...',
+'TR_BOOTLOADER_INSTALLATION_ERROR' => 'Bootloader installation error',
'TR_CANCEL' => 'Cancel',
'TR_CARD_ASSIGNMENT' => 'Card assignment',
'TR_CARD_ASSIGNMENT_LONG' => 'Choose a network card and assign a color
(policy), see the manual for an explanation about policies. A network card can
be assigned \'Not used\' (displayed as \'----\') to leave it unused.',
Modified: ipcop/trunk/langs/it_IT/install.po
===================================================================
--- ipcop/trunk/langs/it_IT/install.po 2009-04-30 23:13:29 UTC (rev 2757)
+++ ipcop/trunk/langs/it_IT/install.po 2009-04-30 23:46:39 UTC (rev 2758)
@@ -40,6 +40,9 @@
msgstr "Assign"
msgid "TR_BACKUP_PASSWORD"
msgstr "Password per 'backup'"
+#### NEW:
+msgid "TR_BOOTLOADER_INSTALLATION_ERROR"
+msgstr "Bootloader installation error"
msgid "TR_BUILDING_INITRD"
msgstr "Creazione INITRD..."
msgid "TR_CANCEL"
Modified: ipcop/trunk/langs/ja_JP/install.po
===================================================================
--- ipcop/trunk/langs/ja_JP/install.po 2009-04-30 23:13:29 UTC (rev 2757)
+++ ipcop/trunk/langs/ja_JP/install.po 2009-04-30 23:46:39 UTC (rev 2758)
@@ -41,6 +41,9 @@
msgstr "Assign"
msgid "TR_BACKUP_PASSWORD"
msgstr "'backup' password"
+#### NEW:
+msgid "TR_BOOTLOADER_INSTALLATION_ERROR"
+msgstr "Bootloader installation error"
msgid "TR_BUILDING_INITRD"
msgstr "Building INITRD..."
msgid "TR_CANCEL"
Modified: ipcop/trunk/langs/lt_LT/install.po
===================================================================
--- ipcop/trunk/langs/lt_LT/install.po 2009-04-30 23:13:29 UTC (rev 2757)
+++ ipcop/trunk/langs/lt_LT/install.po 2009-04-30 23:46:39 UTC (rev 2758)
@@ -41,6 +41,9 @@
msgstr "Assign"
msgid "TR_BACKUP_PASSWORD"
msgstr "'backup' password"
+#### NEW:
+msgid "TR_BOOTLOADER_INSTALLATION_ERROR"
+msgstr "Bootloader installation error"
msgid "TR_BUILDING_INITRD"
msgstr "Building INITRD..."
msgid "TR_CANCEL"
Modified: ipcop/trunk/langs/nb_NO/install.po
===================================================================
--- ipcop/trunk/langs/nb_NO/install.po 2009-04-30 23:13:29 UTC (rev 2757)
+++ ipcop/trunk/langs/nb_NO/install.po 2009-04-30 23:46:39 UTC (rev 2758)
@@ -43,6 +43,9 @@
msgstr "Assign"
msgid "TR_BACKUP_PASSWORD"
msgstr "'backup'-passord"
+#### NEW:
+msgid "TR_BOOTLOADER_INSTALLATION_ERROR"
+msgstr "Bootloader installation error"
msgid "TR_BUILDING_INITRD"
msgstr "Bygger INITRD..."
msgid "TR_CANCEL"
Modified: ipcop/trunk/langs/nl_NL/install.po
===================================================================
--- ipcop/trunk/langs/nl_NL/install.po 2009-04-30 23:13:29 UTC (rev 2757)
+++ ipcop/trunk/langs/nl_NL/install.po 2009-04-30 23:46:39 UTC (rev 2758)
@@ -47,6 +47,9 @@
msgstr "Assign"
msgid "TR_BACKUP_PASSWORD"
msgstr "'backup' wachtwoord"
+#### NEW:
+msgid "TR_BOOTLOADER_INSTALLATION_ERROR"
+msgstr "Bootloader installation error"
msgid "TR_BUILDING_INITRD"
msgstr "INITRD wordt gebouwd..."
msgid "TR_CANCEL"
Modified: ipcop/trunk/langs/pl_PL/install.po
===================================================================
--- ipcop/trunk/langs/pl_PL/install.po 2009-04-30 23:13:29 UTC (rev 2757)
+++ ipcop/trunk/langs/pl_PL/install.po 2009-04-30 23:46:39 UTC (rev 2758)
@@ -41,6 +41,9 @@
msgstr "Assign"
msgid "TR_BACKUP_PASSWORD"
msgstr "'backup' password"
+#### NEW:
+msgid "TR_BOOTLOADER_INSTALLATION_ERROR"
+msgstr "Bootloader installation error"
msgid "TR_BUILDING_INITRD"
msgstr "Tworzenie INITRD..."
msgid "TR_CANCEL"
Modified: ipcop/trunk/langs/pt_BR/install.po
===================================================================
--- ipcop/trunk/langs/pt_BR/install.po 2009-04-30 23:13:29 UTC (rev 2757)
+++ ipcop/trunk/langs/pt_BR/install.po 2009-04-30 23:46:39 UTC (rev 2758)
@@ -41,6 +41,9 @@
msgstr "Assign"
msgid "TR_BACKUP_PASSWORD"
msgstr "Senha do 'backup'"
+#### NEW:
+msgid "TR_BOOTLOADER_INSTALLATION_ERROR"
+msgstr "Bootloader installation error"
msgid "TR_BUILDING_INITRD"
msgstr "Construindo INITRD..."
msgid "TR_CANCEL"
Modified: ipcop/trunk/langs/pt_PT/install.po
===================================================================
--- ipcop/trunk/langs/pt_PT/install.po 2009-04-30 23:13:29 UTC (rev 2757)
+++ ipcop/trunk/langs/pt_PT/install.po 2009-04-30 23:46:39 UTC (rev 2758)
@@ -41,6 +41,9 @@
msgstr "Assign"
msgid "TR_BACKUP_PASSWORD"
msgstr "Palavra-passe 'backup'"
+#### NEW:
+msgid "TR_BOOTLOADER_INSTALLATION_ERROR"
+msgstr "Bootloader installation error"
msgid "TR_BUILDING_INITRD"
msgstr "Construindo INITRD..."
msgid "TR_CANCEL"
Modified: ipcop/trunk/langs/ro_RO/install.po
===================================================================
--- ipcop/trunk/langs/ro_RO/install.po 2009-04-30 23:13:29 UTC (rev 2757)
+++ ipcop/trunk/langs/ro_RO/install.po 2009-04-30 23:46:39 UTC (rev 2758)
@@ -41,6 +41,9 @@
msgstr "Assign"
msgid "TR_BACKUP_PASSWORD"
msgstr "'backup' password"
+#### NEW:
+msgid "TR_BOOTLOADER_INSTALLATION_ERROR"
+msgstr "Bootloader installation error"
msgid "TR_BUILDING_INITRD"
msgstr "Building INITRD..."
msgid "TR_CANCEL"
Modified: ipcop/trunk/langs/ru_RU/install.po
===================================================================
--- ipcop/trunk/langs/ru_RU/install.po 2009-04-30 23:13:29 UTC (rev 2757)
+++ ipcop/trunk/langs/ru_RU/install.po 2009-04-30 23:46:39 UTC (rev 2758)
@@ -40,6 +40,9 @@
msgstr "Assign"
msgid "TR_BACKUP_PASSWORD"
msgstr "'backup' password"
+#### NEW:
+msgid "TR_BOOTLOADER_INSTALLATION_ERROR"
+msgstr "Bootloader installation error"
msgid "TR_BUILDING_INITRD"
msgstr "Building INITRD..."
msgid "TR_CANCEL"
Modified: ipcop/trunk/langs/sk_SK/install.po
===================================================================
--- ipcop/trunk/langs/sk_SK/install.po 2009-04-30 23:13:29 UTC (rev 2757)
+++ ipcop/trunk/langs/sk_SK/install.po 2009-04-30 23:46:39 UTC (rev 2758)
@@ -40,6 +40,9 @@
msgstr "Assign"
msgid "TR_BACKUP_PASSWORD"
msgstr "Heslo používateľa 'backup'"
+#### NEW:
+msgid "TR_BOOTLOADER_INSTALLATION_ERROR"
+msgstr "Bootloader installation error"
msgid "TR_BUILDING_INITRD"
msgstr "Vytváram INITRD ..."
msgid "TR_CANCEL"
Modified: ipcop/trunk/langs/sl_SI/install.po
===================================================================
--- ipcop/trunk/langs/sl_SI/install.po 2009-04-30 23:13:29 UTC (rev 2757)
+++ ipcop/trunk/langs/sl_SI/install.po 2009-04-30 23:46:39 UTC (rev 2758)
@@ -40,6 +40,9 @@
msgstr "Assign"
msgid "TR_BACKUP_PASSWORD"
msgstr "'backup' password"
+#### NEW:
+msgid "TR_BOOTLOADER_INSTALLATION_ERROR"
+msgstr "Bootloader installation error"
msgid "TR_BUILDING_INITRD"
msgstr "Building INITRD..."
msgid "TR_CANCEL"
Modified: ipcop/trunk/langs/so_SO/install.po
===================================================================
--- ipcop/trunk/langs/so_SO/install.po 2009-04-30 23:13:29 UTC (rev 2757)
+++ ipcop/trunk/langs/so_SO/install.po 2009-04-30 23:46:39 UTC (rev 2758)
@@ -41,6 +41,9 @@
msgstr "Assign"
msgid "TR_BACKUP_PASSWORD"
msgstr "'backup' password"
+#### NEW:
+msgid "TR_BOOTLOADER_INSTALLATION_ERROR"
+msgstr "Bootloader installation error"
msgid "TR_BUILDING_INITRD"
msgstr "Samayn INITRD..."
msgid "TR_CANCEL"
Modified: ipcop/trunk/langs/sv_SE/install.po
===================================================================
--- ipcop/trunk/langs/sv_SE/install.po 2009-04-30 23:13:29 UTC (rev 2757)
+++ ipcop/trunk/langs/sv_SE/install.po 2009-04-30 23:46:39 UTC (rev 2758)
@@ -41,6 +41,9 @@
msgstr "Assign"
msgid "TR_BACKUP_PASSWORD"
msgstr "'backup' lösenord"
+#### NEW:
+msgid "TR_BOOTLOADER_INSTALLATION_ERROR"
+msgstr "Bootloader installation error"
msgid "TR_BUILDING_INITRD"
msgstr "Bygger INITRD...."
msgid "TR_CANCEL"
Modified: ipcop/trunk/langs/th_TH/install.po
===================================================================
--- ipcop/trunk/langs/th_TH/install.po 2009-04-30 23:13:29 UTC (rev 2757)
+++ ipcop/trunk/langs/th_TH/install.po 2009-04-30 23:46:39 UTC (rev 2758)
@@ -40,6 +40,9 @@
msgstr "Assign"
msgid "TR_BACKUP_PASSWORD"
msgstr "'backup' password"
+#### NEW:
+msgid "TR_BOOTLOADER_INSTALLATION_ERROR"
+msgstr "Bootloader installation error"
msgid "TR_BUILDING_INITRD"
msgstr "Building INITRD..."
msgid "TR_CANCEL"
Modified: ipcop/trunk/langs/tr_TR/install.po
===================================================================
--- ipcop/trunk/langs/tr_TR/install.po 2009-04-30 23:13:29 UTC (rev 2757)
+++ ipcop/trunk/langs/tr_TR/install.po 2009-04-30 23:46:39 UTC (rev 2758)
@@ -41,6 +41,9 @@
msgstr "Assign"
msgid "TR_BACKUP_PASSWORD"
msgstr "'backup' password"
+#### NEW:
+msgid "TR_BOOTLOADER_INSTALLATION_ERROR"
+msgstr "Bootloader installation error"
msgid "TR_BUILDING_INITRD"
msgstr "Building INITRD..."
msgid "TR_CANCEL"
Modified: ipcop/trunk/langs/ur_PK/install.po
===================================================================
--- ipcop/trunk/langs/ur_PK/install.po 2009-04-30 23:13:29 UTC (rev 2757)
+++ ipcop/trunk/langs/ur_PK/install.po 2009-04-30 23:46:39 UTC (rev 2758)
@@ -40,6 +40,9 @@
msgstr "Assign"
msgid "TR_BACKUP_PASSWORD"
msgstr "'backup' password"
+#### NEW:
+msgid "TR_BOOTLOADER_INSTALLATION_ERROR"
+msgstr "Bootloader installation error"
msgid "TR_BUILDING_INITRD"
msgstr "Building INITRD..."
msgid "TR_CANCEL"
Modified: ipcop/trunk/langs/vi_VN/install.po
===================================================================
--- ipcop/trunk/langs/vi_VN/install.po 2009-04-30 23:13:29 UTC (rev 2757)
+++ ipcop/trunk/langs/vi_VN/install.po 2009-04-30 23:46:39 UTC (rev 2758)
@@ -40,6 +40,9 @@
msgstr "Assign"
msgid "TR_BACKUP_PASSWORD"
msgstr "mật khẩu 'backup'"
+#### NEW:
+msgid "TR_BOOTLOADER_INSTALLATION_ERROR"
+msgstr "Bootloader installation error"
msgid "TR_BUILDING_INITRD"
msgstr "Đang tạo INITRD..."
msgid "TR_CANCEL"
Modified: ipcop/trunk/langs/zh_CN/install.po
===================================================================
--- ipcop/trunk/langs/zh_CN/install.po 2009-04-30 23:13:29 UTC (rev 2757)
+++ ipcop/trunk/langs/zh_CN/install.po 2009-04-30 23:46:39 UTC (rev 2758)
@@ -40,6 +40,9 @@
msgstr "Assign"
msgid "TR_BACKUP_PASSWORD"
msgstr "'backup' password"
+#### NEW:
+msgid "TR_BOOTLOADER_INSTALLATION_ERROR"
+msgstr "Bootloader installation error"
msgid "TR_BUILDING_INITRD"
msgstr "正在构建INITRD..."
msgid "TR_CANCEL"
Modified: ipcop/trunk/langs/zh_TW/install.po
===================================================================
--- ipcop/trunk/langs/zh_TW/install.po 2009-04-30 23:13:29 UTC (rev 2757)
+++ ipcop/trunk/langs/zh_TW/install.po 2009-04-30 23:46:39 UTC (rev 2758)
@@ -40,6 +40,9 @@
msgstr "Assign"
msgid "TR_BACKUP_PASSWORD"
msgstr "'backup' password"
+#### NEW:
+msgid "TR_BOOTLOADER_INSTALLATION_ERROR"
+msgstr "Bootloader installation error"
msgid "TR_BUILDING_INITRD"
msgstr "正在構建INITRD..."
msgid "TR_CANCEL"
Modified: ipcop/trunk/src/installer/partition.c
===================================================================
--- ipcop/trunk/src/installer/partition.c 2009-04-30 23:13:29 UTC (rev
2757)
+++ ipcop/trunk/src/installer/partition.c 2009-04-30 23:46:39 UTC (rev
2758)
@@ -627,7 +627,7 @@
/* Make the new installation bootable, add ramdisksize.
Note that there are few similarities between the architectures here.
*/
-static void make_bootable(char *dev, char *dev2)
+static int make_bootable(char *dev, char *dev2)
{
char command[STRING_SIZE];
char device[STRING_SIZE];
@@ -669,7 +669,9 @@
}
/* Install extlinux and MBR */
- mysystem("/bin/chroot /harddisk /sbin/extlinux --install /boot");
+ if (mysystem("/bin/chroot /harddisk /sbin/extlinux --install /boot")) {
+ return FAILURE;
+ }
snprintf(command, STRING_SIZE, "/bin/cat /harddisk/boot/mbr.bin > %s",
device);
system(command);
@@ -726,12 +728,16 @@
fprintf(flog, "Running ybin\n");
snprintf(command, STRING_SIZE, "/bin/chroot /harddisk /usr/sbin/ybin");
- mysystem(command);
+ if (mysystem(command)) {
+ return FAILURE;
+ }
}
else {
fprintf(flog, "Configuring Open Firmware (OldWorld)\n");
snprintf(command, STRING_SIZE, "/bin/chroot /harddisk
/usr/local/bin/install-quik.sh %s3 %s4", device, device);
- mysystem(command);
+ if (mysystem(command)) {
+ return FAILURE;
+ }
}
#endif
@@ -739,7 +745,7 @@
fprintf(flog, "Installing silo\n");
if (raid) {
/* replace the ROOT_DEV with md0 */
- mysystem("/bin/sed -i -e 's+ROOT_DEV+/dev/md1+g'
/harddisk/etc/silo.conf");
+ mysystem("/bin/sed -i -e 's+ROOT_DEV+/dev/md0+g'
/harddisk/etc/silo.conf");
}
else if (partition_uuidenc[PART_INDEX_ROOT][0]) {
/* replace the ROOT_DEV with UUID partition */
@@ -762,9 +768,29 @@
snprintf(command, STRING_SIZE, "/bin/chroot /harddisk /bin/mount
/proc/openprom");
mysystem(command);
- snprintf(command, STRING_SIZE, "/bin/chroot /harddisk /sbin/silo");
- mysystem(command);
+ /* raid need -t flag to work, does not hurt in non raid case */
+ snprintf(command, STRING_SIZE, "/bin/chroot /harddisk /sbin/silo -t");
+ if (mysystem(command)) {
+ return FAILURE;
+ }
+ /* set boot-device once calculated the number from the letter hda=>disk0
hdc=>disk2 */
+ /* TODO make that work too with device name lenght different of 3
(hardware raid cciss and )? */
+ if (strlen(device) != 7 ) {
+ fprintf(flog, "with mmcblk and cciss, you need to set boot-device
manually with setenv boot-device disk<your number>\n");
+ } else {
+ int devnum = device[7] - 'a'; /* 0/ 1d 2e 3v 4/ 5h 6d 7a */
+ if (!raid) {
+ snprintf(command, STRING_SIZE,
+ "/bin/chroot /harddisk /usr/sbin/eeprom boot-device=disk%d",
devnum);
+ } else {
+ int devnum2 = device2[7] - 'a';
+ snprintf(command, STRING_SIZE,
+ "/bin/chroot /harddisk /usr/sbin/eeprom boot-device=\"disk%d
disk%d\"", devnum, devnum2);
+ }
+ mysystem(command);
+ }
+
/* We can unmount /proc/openprom now */
snprintf(command, STRING_SIZE, "/bin/chroot /harddisk /bin/umount
/proc/openprom");
mysystem(command);
@@ -777,6 +803,7 @@
#endif
newtPopWindow();
+ return SUCCESS;
}
@@ -808,7 +835,10 @@
return FAILURE;
/* Make the new installation bootable */
- make_bootable(dev, dev2);
+ if (make_bootable(dev, dev2)) {
+ errorbox(ipcop_gettext("TR_BOOTLOADER_INSTALLATION_ERROR"));
+ return FAILURE;
+ }
return SUCCESS;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Register Now & Save for Velocity, the Web Performance & Operations
Conference from O'Reilly Media. Velocity features a full day of
expert-led, hands-on workshops and two days of sessions from industry
leaders in dedicated Performance & Operations tracks. Use code vel09scf
and Save an extra 15% before 5/3. http://p.sf.net/sfu/velocityconf
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
