update blocked
-
Hello,
When I try to upgrade my FOG server from 1.5.7.102 to 1.5.7.104, i get this message that appearsroot@srv-fog:~/fogproject# git pull remote: Enumerating objects: 240, done. remote: Counting objects: 100% (240/240), done. remote: Compressing objects: 100% (95/95), done. remote: Total 240 (delta 174), reused 195 (delta 129), pack-reused 0 Réception d'objets: 100% (240/240), 77.58 KiB | 1.01 MiB/s, fait. Résolution des deltas: 100% (174/174), complété avec 43 objets locaux. Depuis https://github.com/FOGProject/fogproject 40cf67e7a..923306718 dev-branch -> origin/dev-branch + dd8727555...a83b77d2c master -> origin/master (mise à jour forcée) 506a3bef3..05c153f2f working-1.6 -> origin/working-1.6 Mise à jour 7f803680a..923306718 error: Vos modifications locales aux fichiers suivants seraient écrasées par la fusion : packages/tftp/10secdelay/i386-efi/intel.efi packages/tftp/10secdelay/i386-efi/ipxe.efi packages/tftp/10secdelay/i386-efi/realtek.efi packages/tftp/10secdelay/i386-efi/snp.efi packages/tftp/10secdelay/i386-efi/snponly.efi packages/tftp/10secdelay/intel.efi packages/tftp/10secdelay/intel.kkpxe packages/tftp/10secdelay/intel.kpxe packages/tftp/10secdelay/intel.pxe packages/tftp/10secdelay/ipxe.efi packages/tftp/10secdelay/ipxe.iso packages/tftp/10secdelay/ipxe.kkpxe packages/tftp/10secdelay/ipxe.kpxe packages/tftp/10secdelay/ipxe.krn packages/tftp/10secdelay/ipxe.lkrn packages/tftp/10secdelay/ipxe.pxe packages/tftp/10secdelay/ipxe.usb packages/tftp/10secdelay/realtek.efi packages/tftp/10secdelay/realtek.kkpxe packages/tftp/10secdelay/realtek.kpxe packages/tftp/10secdelay/realtek.pxe packages/tftp/10secdelay/snp.efi packages/tftp/10secdelay/snponly.efi packages/tftp/10secdelay/undionly.kkpxe packages/tftp/10secdelay/undionly.kpxe packages/tftp/10secdelay/undionly.pxe packages/tftp/i386-efi/intel.efi packages/tftp/i386-efi/ipxe.efi packages/tftp/i386-efi/realtek.efi packages/tftp/i386-efi/snp.efi packages/tftp/i386-efi/snponly.efi packages/tftp/intel.efi packages/tftp/intel.kkpxe packages/tftp/intel.kpxe packages/tftp/intel.pxe packages/tftp/ipxe.efi packages/tftp/ipxe.iso packages/tftp/ipxe.kkpxe packages/tftp/ipxe.kpxe packages/tftp/ipxe.krn packages/tftp/ipxe.lkrn packages/tftp/ipxe.pxe packages/tftp/ipxe.usb packages/tftp/realtek.efi packages/tftp/realtek.kkpxe packages/tftp/realtek.kpxe packages/tftp/realtek.pxe packages/tftp/snp.efi packages/tftp/snponly.efi packages/tftp/undionly.kkpxe packages/tftp/undionly.kpxe packages/tftp/undionly.pxe Veuillez valider ou remiser vos modifications avant la fusion. Abandon root@srv-fog:~/fogproject#I am in Debian 10 and FOG server in configured in https.
What should I do ?
Thank you in advance.Alexandre.
-
@Alexandre @Tom-Elliott I am wondering if using
git reset --hard ; git pullwould be nicer as it does not remove old install logs that might be of interest later on.Beside that we ought to find a nice solution to this as more and more people use HTTPS and will run into this on further updating when using git. Will be thinking about this.
-
Try running
git clean -xfd; git pullthen rerun installer. The installer should rebuild the ipxe files again. -
@Alexandre @Tom-Elliott I am wondering if using
git reset --hard ; git pullwould be nicer as it does not remove old install logs that might be of interest later on.Beside that we ought to find a nice solution to this as more and more people use HTTPS and will run into this on further updating when using git. Will be thinking about this.
-
I try git clean -xfd then git pull, it doesn’t work.
root@srv-fog:~/fogproject# git clean -xfd Suppression de bin/error_logs/ Suppression de rpttmp/ Suppression de tmp/ root@srv-fog:~/fogproject# git pull remote: Enumerating objects: 17, done. remote: Counting objects: 100% (17/17), done. remote: Compressing objects: 100% (1/1), done. remote: Total 9 (delta 8), reused 9 (delta 8), pack-reused 0 Dépaquetage des objets: 100% (9/9), fait. Depuis https://github.com/FOGProject/fogproject 923306718..97b57acea dev-branch -> origin/dev-branch Mise à jour 7f803680a..97b57acea error: Vos modifications locales aux fichiers suivants seraient écrasées par la fusion : packages/tftp/10secdelay/i386-efi/intel.efi packages/tftp/10secdelay/i386-efi/ipxe.efi packages/tftp/10secdelay/i386-efi/realtek.efi packages/tftp/10secdelay/i386-efi/snp.efi packages/tftp/10secdelay/i386-efi/snponly.efi packages/tftp/10secdelay/intel.efi packages/tftp/10secdelay/intel.kkpxe packages/tftp/10secdelay/intel.kpxe packages/tftp/10secdelay/intel.pxe packages/tftp/10secdelay/ipxe.efi packages/tftp/10secdelay/ipxe.iso packages/tftp/10secdelay/ipxe.kkpxe packages/tftp/10secdelay/ipxe.kpxe packages/tftp/10secdelay/ipxe.krn packages/tftp/10secdelay/ipxe.lkrn packages/tftp/10secdelay/ipxe.pxe packages/tftp/10secdelay/ipxe.usb packages/tftp/10secdelay/realtek.efi packages/tftp/10secdelay/realtek.kkpxe packages/tftp/10secdelay/realtek.kpxe packages/tftp/10secdelay/realtek.pxe packages/tftp/10secdelay/snp.efi packages/tftp/10secdelay/snponly.efi packages/tftp/10secdelay/undionly.kkpxe packages/tftp/10secdelay/undionly.kpxe packages/tftp/10secdelay/undionly.pxe packages/tftp/i386-efi/intel.efi packages/tftp/i386-efi/ipxe.efi packages/tftp/i386-efi/realtek.efi packages/tftp/i386-efi/snp.efi packages/tftp/i386-efi/snponly.efi packages/tftp/intel.efi packages/tftp/intel.kkpxe packages/tftp/intel.kpxe packages/tftp/intel.pxe packages/tftp/ipxe.efi packages/tftp/ipxe.iso packages/tftp/ipxe.kkpxe packages/tftp/ipxe.kpxe packages/tftp/ipxe.krn packages/tftp/ipxe.lkrn packages/tftp/ipxe.pxe packages/tftp/ipxe.usb packages/tftp/realtek.efi packages/tftp/realtek.kkpxe packages/tftp/realtek.kpxe packages/tftp/realtek.pxe packages/tftp/snp.efi packages/tftp/snponly.efi packages/tftp/undionly.kkpxe packages/tftp/undionly.kpxe packages/tftp/undionly.pxe Veuillez valider ou remiser vos modifications avant la fusion. AbandonThen I did git reset --hard then git pull, it worked
root@srv-fog:~/fogproject# git reset --hard HEAD est maintenant à 7f803680a Add username substitution to email field for deployment notification root@srv-fog:~/fogproject# git pull Mise à jour 7f803680a..97b57acea Fast-forward README.md | 5 ++--- lib/common/functions.sh | 23 ++++++++++++-------- lib/ubuntu/config.sh | 15 +++++++------ packages/systemd/FOGImageReplicator.service | 11 +++++----- packages/systemd/FOGImageSize.service | 11 +++++----- packages/systemd/FOGMulticastManager.service | 11 +++++----- packages/systemd/FOGPingHosts.service | 11 +++++----- packages/systemd/FOGScheduler.service | 11 +++++----- packages/systemd/FOGSnapinHash.service | 11 +++++----- packages/systemd/FOGSnapinReplicator.service | 11 +++++----- packages/tftp/10secdelay/arm64-efi/intel.efi | Bin 0 -> 244896 bytes packages/tftp/10secdelay/arm64-efi/ipxe.efi | Bin 0 -> 982944 bytes .../tftp/10secdelay/arm64-efi/ncm--ecm--axge.efi | Bin 0 -> 272544 bytes packages/tftp/10secdelay/arm64-efi/realtek.efi | Bin 0 -> 243904 bytes packages/tftp/10secdelay/arm64-efi/snp.efi | Bin 0 -> 242816 bytes packages/tftp/10secdelay/arm64-efi/snponly.efi | Bin 0 -> 242976 bytes packages/tftp/10secdelay/i386-efi/intel.efi | Bin 187872 -> 189792 bytes packages/tftp/10secdelay/i386-efi/ipxe.efi | Bin 921792 -> 925856 bytes .../tftp/10secdelay/i386-efi/ncm--ecm--axge.efi | Bin 0 -> 212096 bytes packages/tftp/10secdelay/i386-efi/realtek.efi | Bin 187648 -> 189600 bytes packages/tftp/10secdelay/i386-efi/snp.efi | Bin 187328 -> 189312 bytes packages/tftp/10secdelay/i386-efi/snponly.efi | Bin 187456 -> 189504 bytes packages/tftp/10secdelay/intel.efi | Bin 227008 -> 228288 bytes packages/tftp/10secdelay/intel.kkpxe | Bin 98311 -> 99402 bytes packages/tftp/10secdelay/intel.kpxe | Bin 98359 -> 99450 bytes packages/tftp/10secdelay/intel.pxe | Bin 98493 -> 99505 bytes packages/tftp/10secdelay/ipxe.efi | Bin 1017088 -> 1015200 bytes packages/tftp/10secdelay/ipxe.iso | Bin 880640 -> 880640 bytes packages/tftp/10secdelay/ipxe.kkpxe | Bin 359646 -> 360132 bytes packages/tftp/10secdelay/ipxe.kpxe | Bin 359694 -> 360180 bytes packages/tftp/10secdelay/ipxe.krn | Bin 359005 -> 359587 bytes packages/tftp/10secdelay/ipxe.lkrn | Bin 359005 -> 359587 bytes packages/tftp/10secdelay/ipxe.pxe | Bin 359817 -> 360093 bytes packages/tftp/10secdelay/ipxe.usb | Bin 1409024 -> 1409024 bytes packages/tftp/10secdelay/ncm--ecm--axge.efi | Bin 0 -> 253952 bytes packages/tftp/10secdelay/realtek.efi | Bin 225984 -> 227200 bytes packages/tftp/10secdelay/realtek.kkpxe | Bin 99132 -> 100235 bytes packages/tftp/10secdelay/realtek.kpxe | Bin 99180 -> 100283 bytes packages/tftp/10secdelay/realtek.pxe | Bin 99240 -> 100357 bytes packages/tftp/10secdelay/snp.efi | Bin 225280 -> 226560 bytes packages/tftp/10secdelay/snponly.efi | Bin 225504 -> 226816 bytes packages/tftp/10secdelay/undionly.kkpxe | Bin 97871 -> 99005 bytes packages/tftp/10secdelay/undionly.kpxe | Bin 97919 -> 99053 bytes packages/tftp/10secdelay/undionly.pxe | Bin 97860 -> 99072 bytes packages/tftp/arm64-efi/intel.efi | Bin 0 -> 244800 bytes packages/tftp/arm64-efi/ipxe.efi | Bin 0 -> 982848 bytes packages/tftp/arm64-efi/ncm--ecm--axge.efi | Bin 0 -> 272448 bytes packages/tftp/arm64-efi/realtek.efi | Bin 0 -> 243808 bytes packages/tftp/arm64-efi/snp.efi | Bin 0 -> 242720 bytes packages/tftp/arm64-efi/snponly.efi | Bin 0 -> 242880 bytes packages/tftp/i386-efi/intel.efi | Bin 187776 -> 189728 bytes packages/tftp/i386-efi/ipxe.efi | Bin 921696 -> 925792 bytes packages/tftp/i386-efi/ncm--ecm--axge.efi | Bin 210080 -> 212032 bytes packages/tftp/i386-efi/realtek.efi | Bin 187584 -> 189504 bytes packages/tftp/i386-efi/snp.efi | Bin 187264 -> 189248 bytes packages/tftp/i386-efi/snponly.efi | Bin 187360 -> 189408 bytes packages/tftp/intel.efi | Bin 226944 -> 228192 bytes packages/tftp/intel.kkpxe | Bin 98224 -> 99445 bytes packages/tftp/intel.kpxe | Bin 98272 -> 99493 bytes packages/tftp/intel.pxe | Bin 98356 -> 99526 bytes packages/tftp/ipxe.efi | Bin 1016960 -> 1015104 bytes packages/tftp/ipxe.iso | Bin 880640 -> 880640 bytes packages/tftp/ipxe.kkpxe | Bin 359745 -> 360043 bytes packages/tftp/ipxe.kpxe | Bin 359793 -> 360091 bytes packages/tftp/ipxe.krn | Bin 359243 -> 359657 bytes packages/tftp/ipxe.lkrn | Bin 359243 -> 359657 bytes packages/tftp/ipxe.pxe | Bin 359688 -> 360187 bytes packages/tftp/ipxe.usb | Bin 1409024 -> 1409024 bytes packages/tftp/ncm--ecm--axge.efi | Bin 252544 -> 253856 bytes packages/tftp/realtek.efi | Bin 225856 -> 227072 bytes packages/tftp/realtek.kkpxe | Bin 99051 -> 100210 bytes packages/tftp/realtek.kpxe | Bin 99099 -> 100258 bytes packages/tftp/realtek.pxe | Bin 99119 -> 100289 bytes packages/tftp/snp-arm.efi | Bin 235744 -> 0 bytes packages/tftp/snp.efi | Bin 225152 -> 226464 bytes packages/tftp/snponly.efi | Bin 225440 -> 226752 bytes packages/tftp/undionly.kkpxe | Bin 97740 -> 98954 bytes packages/tftp/undionly.kpxe | Bin 97788 -> 99002 bytes packages/tftp/undionly.pxe | Bin 97741 -> 99037 bytes packages/web/lib/fog/system.class.php | 4 ++-- .../lib/plugins/ldap/class/ldapmanager.class.php | 2 +- utils/FOGiPXE/buildipxe.sh | 24 ++++++++++++--------- 82 files changed, 83 insertions(+), 67 deletions(-) create mode 100644 packages/tftp/10secdelay/arm64-efi/intel.efi create mode 100644 packages/tftp/10secdelay/arm64-efi/ipxe.efi create mode 100644 packages/tftp/10secdelay/arm64-efi/ncm--ecm--axge.efi create mode 100644 packages/tftp/10secdelay/arm64-efi/realtek.efi create mode 100644 packages/tftp/10secdelay/arm64-efi/snp.efi create mode 100644 packages/tftp/10secdelay/arm64-efi/snponly.efi create mode 100644 packages/tftp/10secdelay/i386-efi/ncm--ecm--axge.efi create mode 100644 packages/tftp/10secdelay/ncm--ecm--axge.efi create mode 100644 packages/tftp/arm64-efi/intel.efi create mode 100644 packages/tftp/arm64-efi/ipxe.efi create mode 100644 packages/tftp/arm64-efi/ncm--ecm--axge.efi create mode 100644 packages/tftp/arm64-efi/realtek.efi create mode 100644 packages/tftp/arm64-efi/snp.efi create mode 100644 packages/tftp/arm64-efi/snponly.efi delete mode 100644 packages/tftp/snp-arm.efi root@srv-fog:~/fogproject# git pull Déjà à jour. root@srv-fog:~/fogproject# cd bin root@srv-fog:~/fogproject/bin# ./installfog.sh Installing LSB_Release as needed * Attempting to get release information.......................Done +------------------------------------------+ | ..#######:. ..,#,.. .::##::. | |.:###### .:;####:......;#;.. | |...##... ...##;,;##::::.##... | | ,# ...##.....##:::## ..:: | | ## .::###,,##. . ##.::#.:######::.| |...##:::###::....#. .. .#...#. #...#:::. | |..:####:.. ..##......##::## .. # | | # . ...##:,;##;:::#: ... ##.. | | .# . .:;####;::::.##:::;#:.. | | # ..:;###.. | | | +------------------------------------------+ | Free Computer Imaging Solution | +------------------------------------------+ | Credits: http://fogproject.org/Credits | | http://fogproject.org/Credits | | Released under GPL Version 3 | +------------------------------------------+ Version: 1.5.7.104 Installer/Updater * Found FOG Settings from previous install at: /opt/fog/.fogsettings * Performing upgrade using these settings Starting Debian based InstallationThank you.
Alexandre.
