Running a RPi2 with dietpi, Pihole core 4.2.2, Web 4.1.1 FTL 4.1.2
When running -up I receive the following:
pihole -up
[i] Checking for updates...
[i] Pi-hole Core: up to date
[i] Web Interface: update available
[i] FTL: update available
[i] Pi-hole Web Admin files out of date, updating local repo.
[✓] Check for existing repository in /var/www/html/admin
[i] Update repo in /var/www/html/admin...
: Could not update local repository. Contact support.
Debug Token:
wsp8qsy5iw!
jfb
March 12, 2019, 1:58am
2
Is this the DietPi installation of Pi-Hole or was it installed via the curl script from pi-hole.net ?
jfb
March 12, 2019, 2:01am
3
Your local installation of Web has been altered somewhere along the way:
*** [ DIAGNOSING ]: Web version
[i] Web: v4.1.1 (https://discourse.pi-hole.net/t/how-do-i-update-pi-hole/249)
[i] Branch: master
[i] Commit: v4.1.1-0-gde7aa5a3-dirty
Run the following commands and post the output:
cd /var/www/html/admin
git status
On branch master
Your branch is behind 'origin/master' by 2790 commits, and can be fast-forwarded .
(use "git pull" to update your local branch)
Changes not staged for commit:
(use "git add ..." to update what will be committed)
(use "git checkout -- ..." to discard changes in working directory)
modified: .github/ISSUE_TEMPLATE.md
modified: .github/PULL_REQUEST_TEMPLATE.md
modified: .gitignore
modified: .pullapprove.yml
modified: .user.php.ini
modified: CONTRIBUTING.md
modified: LICENSE
modified: README.md
modified: api.php
modified: api_FTL.php
modified: api_db.php
modified: auditlog.php
modified: db_graph.php
modified: db_lists.php
modified: db_queries.php
modified: debug.php
modified: gravity.php
modified: help.php
modified: img/boxed-bg.jpg
modified: img/donate.gif
modified: img/favicon.png
modified: img/logo.svg
modified: index.php
modified: list.php
modified: queries.php
modified: queryads.php
modified: scripts/pi-hole/js/auditlog.js
modified: scripts/pi-hole/js/db_graph.js
modified: scripts/pi-hole/js/db_lists.js
modified: scripts/pi-hole/js/db_queries.js
modified: scripts/pi-hole/js/debug.js
modified: scripts/pi-hole/js/footer.js
modified: scripts/pi-hole/js/gravity.js
modified: scripts/pi-hole/js/header.js
modified: scripts/pi-hole/js/index.js
modified: scripts/pi-hole/js/list.js
modified: scripts/pi-hole/js/queries.js
modified: scripts/pi-hole/js/queryads.js
modified: scripts/pi-hole/js/settings.js
modified: scripts/pi-hole/js/taillog-FTL.js
modified: scripts/pi-hole/js/taillog.js
modified: scripts/pi-hole/php/FTL.php
modified: scripts/pi-hole/php/add.php
modified: scripts/pi-hole/php/api_token.php
modified: scripts/pi-hole/php/auth.php
modified: scripts/pi-hole/php/debug.php
modified: scripts/pi-hole/php/footer.php
modified: scripts/pi-hole/php/func.php
modified: scripts/pi-hole/php/get.php
modified: scripts/pi-hole/php/gravity.php
modified: scripts/pi-hole/php/gravity.sh.php
modified: scripts/pi-hole/php/header.php
modified: scripts/pi-hole/php/loginpage.php
modified: scripts/pi-hole/php/password.php
modified: scripts/pi-hole/php/queryads.php
modified: scripts/pi-hole/php/savesettings.php
modified: scripts/pi-hole/php/sub.php
modified: scripts/pi-hole/php/tailLog.php
modified: scripts/pi-hole/php/teleporter.php
modified: scripts/pi-hole/php/update_checker.php
modified: scripts/vendor/Chart.bundle.min.js
modified: scripts/vendor/LICENSE
modified: scripts/vendor/app.min.js
modified: scripts/vendor/dataTables.bootstrap.min.js
modified: scripts/vendor/daterangepicker.js
modified: scripts/vendor/html5shiv.min.js
modified: scripts/vendor/jquery-ui.min.js
modified: scripts/vendor/jquery.confirm.min.js
modified: scripts/vendor/jquery.dataTables.min.js
modified: scripts/vendor/jquery.inputmask.extensions.js
modified: scripts/vendor/jquery.inputmask.js
modified: scripts/vendor/jquery.min.js
modified: scripts/vendor/moment.min.js
modified: scripts/vendor/qrcode.php
modified: scripts/vendor/respond.min.js
modified: settings.php
modified: style/pi-hole.css
modified: style/vendor/AdminLTE.min.css
modified: style/vendor/LICENSE
modified: style/vendor/SourceSansPro/OFL.txt
modified: style/vendor/SourceSansPro/SourceSansPro-Black.ttf
modified: style/vendor/SourceSansPro/SourceSansPro-BlackItalic.ttf
modified: style/vendor/SourceSansPro/SourceSansPro-Bold.ttf
modified: style/vendor/SourceSansPro/SourceSansPro-BoldItalic.ttf
modified: style/vendor/SourceSansPro/SourceSansPro-ExtraLight.ttf
modified: style/vendor/SourceSansPro/SourceSansPro-ExtraLightItalic.tt f
modified: style/vendor/SourceSansPro/SourceSansPro-Italic.ttf
modified: style/vendor/SourceSansPro/SourceSansPro-Light.ttf
modified: style/vendor/SourceSansPro/SourceSansPro-LightItalic.ttf
modified: style/vendor/SourceSansPro/SourceSansPro-Regular.ttf
modified: style/vendor/SourceSansPro/SourceSansPro-Semibold.ttf
modified: style/vendor/SourceSansPro/SourceSansPro-SemiboldItalic.ttf
modified: style/vendor/SourceSansPro/SourceSansPro.css
modified: style/vendor/bootstrap/css/bootstrap.min.css
modified: style/vendor/bootstrap/css/bootstrap.min.css.map
modified: style/vendor/bootstrap/fonts/glyphicons-halflings-regular.eo t
modified: style/vendor/bootstrap/fonts/glyphicons-halflings-regular.sv g
modified: style/vendor/bootstrap/fonts/glyphicons-halflings-regular.tt f
modified: style/vendor/bootstrap/fonts/glyphicons-halflings-regular.wo ff
modified: style/vendor/bootstrap/fonts/glyphicons-halflings-regular.wo ff2
modified: style/vendor/bootstrap/js/bootstrap.min.js
modified: style/vendor/dataTables.bootstrap.min.css
modified: style/vendor/daterangepicker.css
modified: style/vendor/font-awesome-4.5.0/css/font-awesome.min.css
modified: style/vendor/font-awesome-4.5.0/fonts/FontAwesome.otf
modified: style/vendor/font-awesome-4.5.0/fonts/fontawesome-webfont.eo t
modified: style/vendor/font-awesome-4.5.0/fonts/fontawesome-webfont.sv g
modified: style/vendor/font-awesome-4.5.0/fonts/fontawesome-webfont.tt f
modified: style/vendor/font-awesome-4.5.0/fonts/fontawesome-webfont.wo ff
modified: style/vendor/font-awesome-4.5.0/fonts/fontawesome-webfont.wo ff2
modified: style/vendor/ionicons-2.0.1/css/ionicons.min.css
modified: style/vendor/ionicons-2.0.1/fonts/ionicons.eot
modified: style/vendor/ionicons-2.0.1/fonts/ionicons.svg
modified: style/vendor/ionicons-2.0.1/fonts/ionicons.ttf
modified: style/vendor/ionicons-2.0.1/fonts/ionicons.woff
modified: style/vendor/js-warn.css
modified: style/vendor/skin-blue.min.css
modified: taillog-FTL.php
modified: taillog.php
no changes added to commit (use "git add" and/or "git commit -a")
Can I git pull to retrieve latest commit?
Thanks for your responses!
Mcat12
March 14, 2019, 2:47am
6
Make sure to remove the changes first, git reset --hard HEAD
1 Like
Exactly what I was missing, Thank you!
system
Closed
April 5, 2019, 12:06am
8
This topic was automatically closed 21 days after the last reply. New replies are no longer allowed.