Skip to content

Commit

Permalink
Merge pull request #1916 from phillxnet/1915_On_GUI_only_5000_user_sh…
Browse files Browse the repository at this point in the history
…ow_up

On GUI only 5000 user show up. Fixes #1915
  • Loading branch information
schakrava authored Apr 9, 2018
2 parents 1364b45 + d533394 commit 67cf445
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
1 change: 0 additions & 1 deletion buildout.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ parts =
js-sync
collectstatic
gulp-install
gulp-eslint
supervisor
supervisord-conf
create-cert
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ RockStorGlobals = {
navbarLoaded: false,
applianceNameSet: false,
currentAppliance: null,
maxPageSize: 5000,
maxPageSize: 9000,
browserChecked: false,
kernel: null
};
Expand Down
11 changes: 8 additions & 3 deletions src/rockstor/system/osi.py
Original file line number Diff line number Diff line change
Expand Up @@ -2004,17 +2004,22 @@ def hostid():
There's a lazy vendor problem where uuid is not set and defaults to
03000200-0400-0500-0006-000700080009 or
00020003-0004-0005-0006-000700080009. I don't know how these values are
populated, but emperically it seems to be just these
two. non-persistent uuid is generated even in this case.
populated, but empirically it seems to be just these
two. A non-persistent uuid is also generated in this case.
Observed motherboards with these fake non unique puuids:
ASRock N3700-ITX
ASRock C2550D4I
ASRock J3455 ITX - Thanks to forum member adworacz for reporting this one.
"""

fake_puuids = ('03000200-0400-0500-0006-000700080009',
'00020003-0004-0005-0006-00070008000')
try:
with open("/sys/class/dmi/id/product_uuid") as fo:
puuid = fo.readline().strip()
if (puuid in fake_puuids):
raise
raise CommandException
return puuid
except:
return '%s-%s' % (run_command([HOSTID])[0][0], str(uuid.uuid4()))
Expand Down

0 comments on commit 67cf445

Please sign in to comment.