FOG 1.6 Testing Needed - Help would be greatly appreciated as needed
-
Hi Tom,
Iâm going to test it right now !
edit : error message when trying to âgit pullâ on âworking-1.6â branch (sorry, itâs in french) :
root@FOG:/opt/fogproject/bin$ git checkout working-1.6 Basculement sur la branche 'working-1.6' root@FOG:/opt/fogproject/bin$ git pull Pas d'information de suivi distant pour la branche actuelle. Veuillez spécifier une branche avec laquelle fusionner. Référez-vous à git-pull(1) pour de plus amples détails. git pull <distant> <branche> Si vous souhaitez indiquer l'information de suivi distant pour cette branche, vous pouvez le faire avec : git branch --set-upstream-to=origin/<branche> working-1.6
I try to found solution but now I have tons of errorâŠ
git branch --set-upstream-to origin/working-1.6 La branche working-1.6 est paramétrée pour suivre la branche distante working-1.6 depuis origin. root@FOG:/opt/fogproject$ git pull Lots of "needs merge" message La fusion automatique a échoué ; réglez les conflits et validez le résultat. error: vous devez d'abord résoudre votre index courant root@FOG:/opt/fogproject/bin$ git pull needs merge error: Impossible de tirer car vous avez des fichiers non fusionnés. astuce: Corrigez-les puis lancez 'git add/rm <fichier>' astuce: si nécessaire pour marquer la résolution et valider. fatal: Abandon à cause de conflit non résolu.
-
Hi
Installation ok
Full inventory ok
Deployement win7 legacy okIn fog configuration i have this :
FOG Version Information
You are not running the most current version of FOG!You are currently running version: 1.5.4.562
Latest stable version is 1.5.4
Latest svn version is 6078
Latest git version is 1.5.4
-
Hello @Tom-Elliott Would working-1.6 still support storage nodes with the location plug-ins as well as the LDAP plug-in? I would be more than happy to install and provide input to these features since I have the ability to switch back and forth from production FOG Servers in case âtesting serversâ act up and what not. Thank you.
-
@matthieu-jacquart I believe to get the latest so you can see the new branch would be to run
git fetch --all git checkout working-1.6
-
Iâve got this in menu images list all images
All Images
{âerrorâ:"An SQL error occurred: SQLSTATE[42S02]: Base table or view not found: 1146 Table âfog.windowsKeysâ doesnât existSQL: SELECTwkID
,wkID
,wkName
,wkName
,wkDesc
,wkCreatedBy
,wkCreatedTime
,wkKey
\n FROMwindowsKeys
\n \n \n "}and this on Create new image
{âerrorâ:"An SQL error occurred: SQLSTATE[42S02]: Base table or view not found: 1146 Table âfog.windowsKeysâ doesnât existSQL: SELECT
wkID
,wkID
,wkName
,wkName
,wkDesc
,wkCreatedBy
,wkCreatedTime
,wkKey
\n FROMwindowsKeys
\n \n \n "}Debian 8
-
@davido38 the version information is to be expected. This is because itâs not a stable version or rc.
-
@davido38 goto plugins and uninstall Windows keys Plugin.
-
@tom-elliott said in FOG 1.6 Testing Needed - Help would be greatly appreciated as needed:
git fetch --all
git checkout working-1.6It seems to be broken
root@FOG:/opt/fogproject/bin$ git fetch --all Récupération de origin root@FOG:/opt/fogproject/bin$ git checkout working-1.6 README.md: needs merge bin/installfog.sh: needs merge lib/common/functions.sh: needs merge lib/ubuntu/config.sh: needs merge packages/tftp/10secdelay/i386-efi/intel.efi: needs merge packages/tftp/10secdelay/i386-efi/ipxe.efi: needs merge packages/tftp/10secdelay/i386-efi/realtek.efi: needs merge packages/tftp/10secdelay/i386-efi/snp.efi: needs merge packages/tftp/10secdelay/i386-efi/snponly.efi: needs merge packages/tftp/10secdelay/intel.efi: needs merge packages/tftp/10secdelay/ipxe.efi: needs merge packages/tftp/10secdelay/ipxe.iso: needs merge packages/tftp/10secdelay/realtek.efi: needs merge packages/tftp/10secdelay/snp.efi: needs merge packages/tftp/10secdelay/snponly.efi: needs merge packages/tftp/i386-efi/intel.efi: needs merge packages/tftp/i386-efi/ipxe.efi: needs merge packages/tftp/i386-efi/realtek.efi: needs merge packages/tftp/i386-efi/snp.efi: needs merge packages/tftp/i386-efi/snponly.efi: needs merge packages/tftp/intel.efi: needs merge packages/tftp/ipxe.efi: needs merge packages/tftp/ipxe.iso: needs merge packages/tftp/realtek.efi: needs merge packages/tftp/snp.efi: needs merge packages/tftp/snponly.efi: needs merge packages/web/commons/init.php: needs merge packages/web/lib/client/registerclient.class.php: needs merge packages/web/lib/fog/bootmenu.class.php: needs merge packages/web/lib/fog/fogbase.class.php: needs merge packages/web/lib/fog/fogcontroller.class.php: needs merge packages/web/lib/fog/fogmanagercontroller.class.php: needs merge packages/web/lib/fog/fogpage.class.php: needs merge packages/web/lib/fog/fogsubmenu.class.php: needs merge packages/web/lib/fog/fogurlrequests.class.php: needs merge packages/web/lib/fog/group.class.php: needs merge packages/web/lib/fog/host.class.php: needs merge packages/web/lib/fog/image.class.php: needs merge packages/web/lib/fog/imaginglog.class.php: needs merge packages/web/lib/fog/module.class.php: needs merge packages/web/lib/fog/powermanagement.class.php: needs merge packages/web/lib/fog/printer.class.php: needs merge packages/web/lib/fog/snapin.class.php: needs merge packages/web/lib/fog/snapinjob.class.php: needs merge packages/web/lib/fog/storagegroup.class.php: needs merge packages/web/lib/fog/storagenode.class.php: needs merge packages/web/lib/fog/system.class.php: needs merge packages/web/lib/fog/user.class.php: needs merge packages/web/lib/pages/dashboardpage.page.php: needs merge packages/web/lib/pages/fogconfigurationpage.class.php: needs merge packages/web/lib/pages/groupmanagementpage.class.php: needs merge packages/web/lib/pages/hostmanagementpage.class.php: needs merge packages/web/lib/pages/imagemanagementpage.class.php: needs merge packages/web/lib/pages/processlogin.page.php: needs merge packages/web/lib/pages/snapinmanagementpage.class.php: needs merge packages/web/lib/pages/taskmanagementpage.class.php: needs merge packages/web/lib/plugins/accesscontrol/class/accesscontrol.class.php: needs merge packages/web/lib/plugins/accesscontrol/hooks/addaccesscontrolapi.hook.php: needs merge packages/web/lib/plugins/accesscontrol/js/fog.accesscontrol.edit.js: needs merge packages/web/lib/plugins/accesscontrol/js/fog.accesscontrol.js: needs merge packages/web/lib/plugins/accesscontrol/pages/accesscontrolmanagementpage.class.php: needs merge packages/web/lib/plugins/ldap/hooks/ldappluginhook.hook.php: needs merge packages/web/lib/plugins/ldap/js/fog.ldap.js: needs merge packages/web/lib/plugins/location/class/location.class.php: needs merge packages/web/lib/plugins/location/hooks/addlocationgroup.hook.php: needs merge packages/web/lib/plugins/location/hooks/changeitems.hook.php: needs merge packages/web/lib/plugins/location/js/fog.location.js: needs merge packages/web/lib/plugins/pushbullet/js/fog.pushbullet.js: needs merge packages/web/lib/plugins/site/class/site.class.php: needs merge packages/web/lib/plugins/site/hooks/addsiteapi.hook.php: needs merge packages/web/lib/plugins/site/hooks/addsitegroup.hook.php: needs merge packages/web/lib/plugins/site/hooks/addsitehost.hook.php: needs merge packages/web/lib/plugins/site/js/fog.site.edit.js: needs merge packages/web/lib/plugins/site/js/fog.site.js: needs merge packages/web/lib/plugins/site/pages/sitemanagementpage.class.php: needs merge packages/web/lib/plugins/slack/js/fog.slack.js: needs merge packages/web/lib/plugins/taskstateedit/js/fog.taskstateedit.js: needs merge packages/web/lib/plugins/tasktypeedit/js/fog.tasktypeedit.js: needs merge packages/web/lib/plugins/windowskey/class/windowskey.class.php: needs merge packages/web/lib/plugins/windowskey/js/fog.windowskey.js: needs merge packages/web/lib/plugins/windowskey/pages/windowskeymanagementpage.class.php: needs merge packages/web/lib/plugins/wolbroadcast/js/fog.wolbroadcast.js: needs merge packages/web/lib/reg-task/registration.class.php: needs merge packages/web/lib/reports/host_list.report.php: needs merge packages/web/lib/reports/product_keys.report.php: needs merge packages/web/lib/router/route.class.php: needs merge packages/web/lib/service/fogservice.class.php: needs merge packages/web/management/css/default/fog.css: needs merge packages/web/management/export.php: needs merge packages/web/management/js/fog/fog.dashboard.js: needs merge packages/web/management/js/fog/fog.group.edit.js: needs merge packages/web/management/js/fog/fog.host.edit.js: needs merge packages/web/management/js/fog/fog.schema.js: needs merge packages/web/management/js/fog/fog.storage.js: needs merge packages/web/management/js/fog/snapin/fog.snapin.maker.js: needs merge packages/web/management/languages/de_DE.UTF-8/LC_MESSAGES/messages.po: needs merge packages/web/management/languages/en_US.UTF-8/LC_MESSAGES/messages.po: needs merge packages/web/management/languages/es_ES.UTF-8/LC_MESSAGES/messages.po: needs merge packages/web/management/languages/fr_FR.UTF-8/LC_MESSAGES/messages.po: needs merge packages/web/management/languages/it_IT.UTF-8/LC_MESSAGES/messages.po: needs merge packages/web/management/languages/messages.pot: needs merge packages/web/management/languages/pt_BR.UTF-8/LC_MESSAGES/messages.po: needs merge packages/web/management/languages/zh_CN.UTF-8/LC_MESSAGES/messages.po: needs merge packages/web/management/other/index.php: needs merge packages/web/status/bandwidth.php: needs merge error: vous devez d'abord résoudre votre index courant
What can I do to fix it ?
-
@matthieu-jacquart try
git reset --hard
then fetch checkout -
@jgallo yes you should still have locationnplugin and ldap.
-
@tom-elliott said in FOG 1.6 Testing Needed - Help would be greatly appreciated as needed:
git reset --hard
Nop
root@FOG:/opt/fogproject/bin$ git reset --hard HEAD est maintenant à d9e7a329a Push up 1.5.4 root@FOG:/opt/fogproject/bin$ git checkout working-1.6 Déjà sur 'working-1.6' Votre branche et 'origin/working-1.6' ont divergé, et ont 130 et 567 commits différents chacune respectivement. (utilisez "git pull" pour fusionner la branche distante dans la vÎtre) root@FOG:/opt/fogproject/bin$ git pull warning: Cannot merge binary files: packages/tftp/snponly.efi (HEAD vs. 0b6c9383ff0437db281755919ea42d1f0c2af7fd) warning: Cannot merge binary files: packages/tftp/snp.efi (HEAD vs. 0b6c9383ff0437db281755919ea42d1f0c2af7fd) warning: Cannot merge binary files: packages/tftp/realtek.efi (HEAD vs. 0b6c9383ff0437db281755919ea42d1f0c2af7fd) warning: Cannot merge binary files: packages/tftp/ipxe.iso (HEAD vs. 0b6c9383ff0437db281755919ea42d1f0c2af7fd) warning: Cannot merge binary files: packages/tftp/ipxe.efi (HEAD vs. 0b6c9383ff0437db281755919ea42d1f0c2af7fd) warning: Cannot merge binary files: packages/tftp/intel.efi (HEAD vs. 0b6c9383ff0437db281755919ea42d1f0c2af7fd) warning: Cannot merge binary files: packages/tftp/i386-efi/snponly.efi (HEAD vs. 0b6c9383ff0437db281755919ea42d1f0c2af7fd) warning: Cannot merge binary files: packages/tftp/i386-efi/snp.efi (HEAD vs. 0b6c9383ff0437db281755919ea42d1f0c2af7fd) warning: Cannot merge binary files: packages/tftp/i386-efi/realtek.efi (HEAD vs. 0b6c9383ff0437db281755919ea42d1f0c2af7fd) warning: Cannot merge binary files: packages/tftp/i386-efi/ipxe.efi (HEAD vs. 0b6c9383ff0437db281755919ea42d1f0c2af7fd) warning: Cannot merge binary files: packages/tftp/i386-efi/intel.efi (HEAD vs. 0b6c9383ff0437db281755919ea42d1f0c2af7fd) warning: Cannot merge binary files: packages/tftp/10secdelay/snponly.efi (HEAD vs. 0b6c9383ff0437db281755919ea42d1f0c2af7fd) warning: Cannot merge binary files: packages/tftp/10secdelay/snp.efi (HEAD vs. 0b6c9383ff0437db281755919ea42d1f0c2af7fd) warning: Cannot merge binary files: packages/tftp/10secdelay/realtek.efi (HEAD vs. 0b6c9383ff0437db281755919ea42d1f0c2af7fd) warning: Cannot merge binary files: packages/tftp/10secdelay/ipxe.iso (HEAD vs. 0b6c9383ff0437db281755919ea42d1f0c2af7fd) warning: Cannot merge binary files: packages/tftp/10secdelay/ipxe.efi (HEAD vs. 0b6c9383ff0437db281755919ea42d1f0c2af7fd) warning: Cannot merge binary files: packages/tftp/10secdelay/intel.efi (HEAD vs. 0b6c9383ff0437db281755919ea42d1f0c2af7fd) warning: Cannot merge binary files: packages/tftp/10secdelay/i386-efi/snponly.efi (HEAD vs. 0b6c9383ff0437db281755919ea42d1f0c2af7fd) warning: Cannot merge binary files: packages/tftp/10secdelay/i386-efi/snp.efi (HEAD vs. 0b6c9383ff0437db281755919ea42d1f0c2af7fd) warning: Cannot merge binary files: packages/tftp/10secdelay/i386-efi/realtek.efi (HEAD vs. 0b6c9383ff0437db281755919ea42d1f0c2af7fd) warning: Cannot merge binary files: packages/tftp/10secdelay/i386-efi/ipxe.efi (HEAD vs. 0b6c9383ff0437db281755919ea42d1f0c2af7fd) warning: Cannot merge binary files: packages/tftp/10secdelay/i386-efi/intel.efi (HEAD vs. 0b6c9383ff0437db281755919ea42d1f0c2af7fd) Fusion automatique de packages/web/status/bandwidth.php CONFLIT (contenu) : Conflit de fusion dans packages/web/status/bandwidth.php Fusion automatique de packages/web/service/oucheck.php Fusion automatique de packages/web/service/hostinfo.php
-
Uninstall selected is greyed, if i click on it i have plugin install success popup
and the plugin is still installed
-
@davido38 From the plugin page, select the table entry. The uninstall/install should become selectable.
-
@matthieu-jacquart Can you get me in chat here?
-
@davido38 The buttons with drop down are still selectable as long as an item is selected. There isnât, as far as Iâve found, a way to make the drop buttons (split buttons is the real term) colored, so they look greyed out.
-
@tom-elliott Sweet. Got it working and looks very fresh and feels snappy. I found a couple cosmetic items already but I wanted to ask where would be the best place to inform you of observations or bugs we find? In this thread or private messages? Thanks.
-
@jgallo Iâd actually recommend opening them up in Bug reports. Iâll create a thread for 1.6 specific things, just post in that thread, similar to the old 0.33b days I guess?
-
Any chance 1.6 introduces unique identifier? This is the feature Iâve been most waiting on so I can stop dancing around with MAC address settings for hosts.
-
@astrugatch It does not currently, not that it canât be added later though.
This isnât because we donât want to, but rather because the UUID field is more unreliable than the MAC Address method. (Not all machines set the UUID, and some even set the UUID to the same for all machines in the model).
-
Would System Serial be more reliable, at least with major manufacturers?