Skip to content
This repository was archived by the owner on Feb 27, 2023. It is now read-only.

Commit 5141b08

Browse files
XECDesignXECDesign
committed
Do not remount /settings when copying wpa_supplicant.conf
/settings is mounted rw by default. Remounting it makes later steps fail. Fixes #621
1 parent 2254d5f commit 5141b08

23 files changed

+968
-970
lines changed

‎recovery/mainwindow.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -970,7 +970,6 @@ void MainWindow::copyWpa()
970970
{
971971
qDebug() << "Copying user wpa_supplicant.conf to /settings/wpa_supplicant.conf";
972972

973-
QProcess::execute("mount -o remount,rw /settings");
974973
QProcess::execute("mount -o remount,rw /mnt");
975974

976975
backupFile("/settings/wpa_supplicant.conf");
@@ -982,7 +981,6 @@ void MainWindow::copyWpa()
982981
backupFile("/mnt/wpa_supplicant.conf");
983982

984983
QProcess::execute("sync");
985-
QProcess::execute("mount -o remount,ro /settings");
986984
QProcess::execute("mount -o remount,ro /mnt");
987985
}
988986
else if ( !f.exists() )

‎recovery/translation_ar.ts

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -342,91 +342,91 @@ WARNING: This will erase all data on your SD card</source>
342342
<translation>SD اعداد بطاقة</translation>
343343
</message>
344344
<message>
345-
<location filename="mainwindow.cpp" line="256"/>
345+
<location filename="mainwindow.cpp" line="253"/>
346346
<source>Please wait while NOOBS initialises</source>
347347
<translation type="unfinished"></translation>
348348
</message>
349349
<message>
350-
<location filename="mainwindow.cpp" line="344"/>
351-
<location filename="mainwindow.cpp" line="1287"/>
352-
<location filename="mainwindow.cpp" line="1855"/>
350+
<location filename="mainwindow.cpp" line="341"/>
351+
<location filename="mainwindow.cpp" line="1278"/>
352+
<location filename="mainwindow.cpp" line="1839"/>
353353
<source>RECOMMENDED</source>
354354
<translation>اوصي</translation>
355355
</message>
356356
<message>
357-
<location filename="mainwindow.cpp" line="596"/>
358-
<location filename="mainwindow.cpp" line="615"/>
357+
<location filename="mainwindow.cpp" line="593"/>
358+
<location filename="mainwindow.cpp" line="612"/>
359359
<source>Confirm</source>
360360
<translation>تاكيد</translation>
361361
</message>
362362
<message>
363-
<location filename="mainwindow.cpp" line="1171"/>
363+
<location filename="mainwindow.cpp" line="1162"/>
364364
<source>Error downloading distribution list from Internet</source>
365365
<translation type="unfinished"></translation>
366366
</message>
367367
<message>
368-
<location filename="mainwindow.cpp" line="1646"/>
368+
<location filename="mainwindow.cpp" line="1630"/>
369369
<source>Network access is required to use NOOBS without local images. Please select your wifi network in the next screen.</source>
370370
<translation type="unfinished"></translation>
371371
</message>
372372
<message>
373-
<location filename="mainwindow.cpp" line="1654"/>
373+
<location filename="mainwindow.cpp" line="1638"/>
374374
<source>Wired network access is required to use NOOBS without local images. Please insert a network cable into the network port.</source>
375375
<translation type="unfinished"></translation>
376376
</message>
377377
<message>
378-
<location filename="mainwindow.cpp" line="1769"/>
378+
<location filename="mainwindow.cpp" line="1753"/>
379379
<source>Are you sure you want to reformat the drive &apos;%1&apos; for use with NOOBS? All existing data on the drive will be deleted!</source>
380380
<translation type="unfinished"></translation>
381381
</message>
382382
<message>
383-
<location filename="mainwindow.cpp" line="146"/>
383+
<location filename="mainwindow.cpp" line="143"/>
384384
<source>Error mounting settings partition</source>
385385
<translation>خطا في تركيب قسم إعدادات</translation>
386386
</message>
387387
<message>
388-
<location filename="mainwindow.cpp" line="147"/>
388+
<location filename="mainwindow.cpp" line="144"/>
389389
<source>Persistent settings partition seems corrupt. Reformat?</source>
390390
<translation>تقسيم الأعدادات الدائم يبدو فاسد. إعادة صيغة؟</translation>
391391
</message>
392392
<message>
393-
<location filename="mainwindow.cpp" line="154"/>
393+
<location filename="mainwindow.cpp" line="151"/>
394394
<source>Reformat failed</source>
395395
<translation>إعادة الصيغة فشلت</translation>
396396
</message>
397397
<message>
398-
<location filename="mainwindow.cpp" line="154"/>
398+
<location filename="mainwindow.cpp" line="151"/>
399399
<source>SD card might be damaged</source>
400400
<translation>معطوبة SD قد تكون بطاقة</translation>
401401
</message>
402402
<message>
403-
<location filename="mainwindow.cpp" line="591"/>
403+
<location filename="mainwindow.cpp" line="588"/>
404404
<source>Warning: this will install the selected Operating System(s). All existing data on the SD card will be overwritten, including any OSes that are already installed.</source>
405405
<translation>بما في ذلك اي أنظمه تثبيت مثبته بالفعل.SD تحذير: سيؤدي ذلك إلى تثبيت نظام (أنظمه) التشغيل المحددة. ستتم الكتابة فوق كافة البيانات الموجودة علي بطاقة.</translation>
406406
</message>
407407
<message>
408-
<location filename="mainwindow.cpp" line="692"/>
409-
<location filename="mainwindow.cpp" line="1185"/>
408+
<location filename="mainwindow.cpp" line="689"/>
409+
<location filename="mainwindow.cpp" line="1176"/>
410410
<source>Error</source>
411411
<translation>خطا</translation>
412412
</message>
413413
<message>
414-
<location filename="mainwindow.cpp" line="347"/>
414+
<location filename="mainwindow.cpp" line="344"/>
415415
<source>INSTALLED</source>
416416
<translation>مثبت</translation>
417417
</message>
418418
<message>
419-
<location filename="mainwindow.cpp" line="709"/>
419+
<location filename="mainwindow.cpp" line="706"/>
420420
<source>NOOBS v%1 - Built: %2</source>
421421
<translation type="unfinished"></translation>
422422
</message>
423423
<message>
424-
<location filename="mainwindow.cpp" line="809"/>
424+
<location filename="mainwindow.cpp" line="806"/>
425425
<source>Display Mode Changed</source>
426426
<translation>نمط العرض تغير</translation>
427427
</message>
428428
<message>
429-
<location filename="mainwindow.cpp" line="741"/>
429+
<location filename="mainwindow.cpp" line="738"/>
430430
<source>HDMI preferred mode</source>
431431
<translation>المفضل HDMI نمط</translation>
432432
</message>
@@ -441,103 +441,103 @@ WARNING: This will erase all data on your SD card</source>
441441
<translation>إعدادات التقسيم المتزايد</translation>
442442
</message>
443443
<message>
444-
<location filename="mainwindow.cpp" line="593"/>
444+
<location filename="mainwindow.cpp" line="590"/>
445445
<source>SD card</source>
446446
<translation>بطاقة SD</translation>
447447
</message>
448448
<message>
449-
<location filename="mainwindow.cpp" line="593"/>
449+
<location filename="mainwindow.cpp" line="590"/>
450450
<source>drive</source>
451451
<translation>محرك</translation>
452452
</message>
453453
<message>
454-
<location filename="mainwindow.cpp" line="616"/>
454+
<location filename="mainwindow.cpp" line="613"/>
455455
<source>Warning: incompatible Operating System(s) detected. The following OSes aren&apos;t supported on this revision of Raspberry Pi and may fail to boot or function correctly:</source>
456456
<translation>التالي لم يدعم على هذا تنقيح النسبة الثابتة توت عليق وقد يخفق في الاقلاع أو إشتغال بشكل صحيح OSes تحذير: أنظمة التشغيل الغير متوافقة إكتشفت:</translation>
457457
</message>
458458
<message>
459-
<location filename="mainwindow.cpp" line="658"/>
459+
<location filename="mainwindow.cpp" line="655"/>
460460
<source>The install process will begin shortly.</source>
461461
<translation>ستبدا عمليه التثبيت قريبا.</translation>
462462
</message>
463463
<message>
464-
<location filename="mainwindow.cpp" line="680"/>
464+
<location filename="mainwindow.cpp" line="677"/>
465465
<source>OS(es) installed</source>
466466
<translation>OS (es) مثبت</translation>
467467
</message>
468468
<message>
469-
<location filename="mainwindow.cpp" line="681"/>
469+
<location filename="mainwindow.cpp" line="678"/>
470470
<source>OS(es) Installed Successfully</source>
471471
<translation>OS (es) ثبت بنجاح</translation>
472472
</message>
473473
<message>
474-
<location filename="mainwindow.cpp" line="745"/>
474+
<location filename="mainwindow.cpp" line="742"/>
475475
<source>HDMI safe mode</source>
476476
<translation>HDMI الوضع الأمن</translation>
477477
</message>
478478
<message>
479-
<location filename="mainwindow.cpp" line="749"/>
479+
<location filename="mainwindow.cpp" line="746"/>
480480
<source>composite PAL mode</source>
481481
<translation>وضع PAL المركب</translation>
482482
</message>
483483
<message>
484-
<location filename="mainwindow.cpp" line="753"/>
484+
<location filename="mainwindow.cpp" line="750"/>
485485
<source>composite NTSC mode</source>
486486
<translation>وضع NTSC المركب</translation>
487487
</message>
488488
<message>
489-
<location filename="mainwindow.cpp" line="810"/>
489+
<location filename="mainwindow.cpp" line="807"/>
490490
<source>Display mode changed to %1
491491
Would you like to make this setting permanent?</source>
492492
<translation>تم تغيير وضع العرض إلى %1
493493
هل ترغب في جعل هذا الاعداد دائما ؟</translation>
494494
</message>
495495
<message>
496-
<location filename="mainwindow.cpp" line="1171"/>
497-
<location filename="mainwindow.cpp" line="1516"/>
498-
<location filename="mainwindow.cpp" line="1526"/>
496+
<location filename="mainwindow.cpp" line="1162"/>
497+
<location filename="mainwindow.cpp" line="1503"/>
498+
<location filename="mainwindow.cpp" line="1513"/>
499499
<source>Download error</source>
500500
<translation>خطا في التحميل</translation>
501501
</message>
502502
<message>
503-
<location filename="mainwindow.cpp" line="1185"/>
503+
<location filename="mainwindow.cpp" line="1176"/>
504504
<source>Error parsing list.json downloaded from server</source>
505505
<translation>خطا في توزيع القائمة. json تحميلها من الخادم</translation>
506506
</message>
507507
<message>
508-
<location filename="mainwindow.cpp" line="1405"/>
508+
<location filename="mainwindow.cpp" line="1396"/>
509509
<source>Needed</source>
510510
<translation>بحاجة</translation>
511511
</message>
512512
<message>
513-
<location filename="mainwindow.cpp" line="1406"/>
513+
<location filename="mainwindow.cpp" line="1397"/>
514514
<source>Available</source>
515515
<translation>متاح</translation>
516516
</message>
517517
<message>
518-
<location filename="mainwindow.cpp" line="1516"/>
518+
<location filename="mainwindow.cpp" line="1503"/>
519519
<source>Error downloading meta file</source>
520520
<translation>حدث خطأ أثناء تنزيل ملف ميتا</translation>
521521
</message>
522522
<message>
523-
<location filename="mainwindow.cpp" line="1526"/>
523+
<location filename="mainwindow.cpp" line="1513"/>
524524
<source>Error writing downloaded file to SD card. SD card or file system may be damaged.</source>
525525
<translation>حدث خطأ أثناء كتابة الملف الذي تم تنزيله إلى بطاقة SD . قد تتلف بطاقة SD أو نظام الملفات.</translation>
526526
</message>
527527
<message>
528-
<location filename="mainwindow.cpp" line="1768"/>
528+
<location filename="mainwindow.cpp" line="1752"/>
529529
<source>Reformat drive?</source>
530530
<translation>أعاده تهيئه محرك الاقراص ؟</translation>
531531
</message>
532532
<message>
533-
<location filename="mainwindow.cpp" line="928"/>
534-
<location filename="mainwindow.cpp" line="1645"/>
535-
<location filename="mainwindow.cpp" line="1653"/>
533+
<location filename="mainwindow.cpp" line="925"/>
534+
<location filename="mainwindow.cpp" line="1629"/>
535+
<location filename="mainwindow.cpp" line="1637"/>
536536
<source>No network access</source>
537537
<translation>لا يوجد وصول إلى الشبكة</translation>
538538
</message>
539539
<message>
540-
<location filename="mainwindow.cpp" line="929"/>
540+
<location filename="mainwindow.cpp" line="926"/>
541541
<source>Wired network access is required for this feature. Please insert a network cable into the network port.</source>
542542
<translation>مطلوب الوصول إلى الشبكة السلكية لهذه الميزة. الرجاء إدخال كبل شبكه اتصال في منفذ الشبكة.</translation>
543543
</message>

0 commit comments

Comments
 (0)