Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

replace fstab by explicit systemd mount units to ensure proper order #807

Merged
merged 2 commits into from
May 30, 2020
Merged

replace fstab by explicit systemd mount units to ensure proper order #807

merged 2 commits into from
May 30, 2020

Conversation

mstormi
Copy link
Contributor

@mstormi mstormi commented Mar 24, 2020 •
edited
Loading

... to make ZRAM work with Samba shares of /srv/openhab2-*

Note this effectively removes most entries from /etc/fstab but that's intentional else we would not get the intended order of mounts to work.

Use option 13 to validate.

Fixes #795

Signed-off-by: Markus Storm [email protected]

This was referenced Mar 24, 2020
Closed
Closed
@mstormi mstormi changed the title replace fstab by exlicit systemd mount units to ensure proper order replace fstab by explicit systemd mount units to ensure proper order Mar 26, 2020
@mstormi mstormi requested a review from BClark09 March 27, 2020 22:20
@mstormi mstormi force-pushed the systemd-zram-mount-order branch from 6624f38 to 5cabef3 Compare April 4, 2020 21:08
@mstormi mstormi added this to the Refinement and Refocus milestone Apr 16, 2020
mstormi added a commit to mstormi/openhabian that referenced this pull request May 5, 2020
@mstormi
Replace fstab by explicit systemd units to ensure right mount order (o…
363c630 
…penhab#807)

To ensure ZRAM and Samba properly work together on sharing
/srv/openhab2-*, we need to change the order of mounts.
As this cannot be done in fstab, I removed them and setup separate
systemd mount units instead.

Signed-off-by: Markus Storm <[email protected]>
@mstormi mstormi force-pushed the systemd-zram-mount-order branch from 56f8682 to 363c630 Compare May 5, 2020 08:59
@mstormi mstormi requested a review from holgerfriedrich May 7, 2020 22:49
@mstormi
Copy link
Contributor Author

mstormi commented May 7, 2020 •
edited
Loading

we should have this before default ZRAM (#764)
it's pretty straightforward to test as well if you want to

mstormi added a commit to mstormi/openhabian that referenced this pull request May 11, 2020
@mstormi
Replace fstab by explicit systemd units to ensure right mount order (o…
9a2966f 
…penhab#807)

To ensure ZRAM and Samba properly work together on sharing
/srv/openhab2-*, we need to change the order of mounts.
As this cannot be done in fstab, I removed them and setup separate
systemd mount units instead.

Signed-off-by: Markus Storm <[email protected]>
@mstormi mstormi force-pushed the systemd-zram-mount-order branch from 363c630 to 9a2966f Compare May 11, 2020 13:15
mstormi added a commit to mstormi/openhabian that referenced this pull request May 18, 2020
@mstormi
Replace fstab by explicit systemd units to ensure right mount order (o…
2edca16 
…penhab#807)

To ensure ZRAM and Samba properly work together on sharing
/srv/openhab2-*, we need to change the order of mounts.
As this cannot be done in fstab, I removed them and setup separate
systemd mount units instead.

Signed-off-by: Markus Storm <[email protected]>
@mstormi mstormi force-pushed the systemd-zram-mount-order branch from 9a2966f to 2edca16 Compare May 18, 2020 10:59
mstormi added a commit to mstormi/openhabian that referenced this pull request May 25, 2020
@mstormi
Replace fstab by explicit systemd units to ensure right mount order (o…
9f721e7 
…penhab#807)

To ensure ZRAM and Samba properly work together on sharing
/srv/openhab2-*, we need to change the order of mounts.
As this cannot be done in fstab, I removed them and setup separate
systemd mount units instead.

Signed-off-by: Markus Storm <[email protected]>
@mstormi mstormi force-pushed the systemd-zram-mount-order branch from 2edca16 to 9f721e7 Compare May 25, 2020 13:15
@mstormi mstormi mentioned this pull request May 26, 2020
Merged
@mstormi
Replace fstab by explicit systemd units to ensure right mount order (o…
33bf464 
…penhab#807)

To ensure ZRAM and Samba properly work together on sharing
/srv/openhab2-*, we need to change the order of mounts.
As this cannot be done in fstab, I removed them and setup separate
systemd mount units instead.

Signed-off-by: Markus Storm <[email protected]>
@mstormi mstormi force-pushed the systemd-zram-mount-order branch from 9f721e7 to 33bf464 Compare May 29, 2020 08:40
@mstormi
Copy link
Contributor Author

mstormi commented May 29, 2020 •
edited
Loading

@holgerfriedrich @BClark09 anyone care to quickly give this a review ? (or @ecdye?)
I'd like to have this in before activating ZRAM.
(just apply and reboot your box to see it work - well, hopefully 😆)

ecdye
ecdye approved these changes May 29, 2020
View reviewed changes
Copy link
Member

@ecdye ecdye left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, Although after testing it on my box, I can connect just fine and both the openHAB-conf share and the openhabian share work perfect, but the openHAB-share share won't load any of its subfolders it only shows and nothing beyond that.

openhab2-addons
openhab2-conf
openhab2-logs
openhab2-sys
openhab2-userdata
README.txt

@mstormi
Copy link
Contributor Author

mstormi commented May 29, 2020 •
edited
Loading

but the openHAB-share share won't load any of its subfolders

by "the openHAB-share share" you mean the first one from smb.conf, i.e. /srv as quoted below ?
Ok now that possibly is because it is exported before ZRAM, that's what happened with all the /srv/* before my patch).
So you'll export/access the lower FS (which is the never changing part in the OverlayFS that ZRAM sets up, all changes go to the upper FS).

I didn't create the Samba stuff and don't know what the person to share that had in mind so wondering how to cope with that... easiest is to leave that as-is or switch that share off, I don't know what it is good for anyway. If we wanted to share more than the confdir (/etc/openhab2) we could add more share (they're already there just commented out for the time being).

#=================== Custom Share Definitions ====================

[openHAB-share]
  comment=openHAB2 combined folders
  path=/srv
  writeable=yes
  public=no
  create mask=0664
  directory mask=0775
  veto files = /Thumbs.db/.DS_Store/._.DS_Store/.apdisk/._*/
  delete veto files = yes

@ecdye
Copy link
Member

ecdye commented May 29, 2020

Yes that is what I was talking about. It is good for accessing the other openHAB related items that may need to be edited. I don't think we should get rid of it but is up to you.

@mstormi
Copy link
Contributor Author

mstormi commented May 29, 2020 •
edited
Loading

what other ones? srv/openhab2-conf is /etc/openhab, everything an ordinary user would ever need to access is below or isn't it ? Logs are accessible via Frontail.

And they can always logon to see more.

BTW only new installations should be affected so it shouldn't "disappear" for anyone who is used to it.

@mstormi
change Samba shares (include logs, exclude /srv overview share, remov…
fc12d5b 
…e Samba defaults like printers)

Signed-off-by: Markus Storm <[email protected]>
@mstormi
Copy link
Contributor Author

mstormi commented May 29, 2020

see changed includes/smb.conf

Is that now a reasonable set to share ? @holgerfriedrich ?

@ecdye
Copy link
Member

ecdye commented May 29, 2020

True, I'm ok with it.

@mstormi mstormi merged commit 4d68e6a into openhab:master May 30, 2020
mstormi added a commit that referenced this pull request May 30, 2020
@mstormi @holgerfriedrich @ecdye
Initialize stable branch to current master (#934)
de4f975 
* Enhanced and more verbose testing in Travis (#859)
* ZRAM tests to work if on ARM but lxc
* cond_echo cmd in tryUntil()
* restrict container to 1G for RPi3
* dont allow for failure of BATS tests
* add warning 64bit on aarch64 is NOT supposed to work; check if OH downgrades to 32bit
* reduce to a single shellcheck run (else builds succeed when there's no error in the last run)
* increased verbosity on test cases

Signed-off-by: Markus Storm <[email protected]>

* Grafana/InfluxDB installation enhancements (#860)
* Timeouts for service start #760
* Grafana admin password length is enforced #562
* Local installation of InfluxDB now also patches existing installations
* Password reset for existing Grafana and local InfluxDB installations
* In interactive mode, display a warning if less than 1GB RAM is detected

Signed-off-by: Holger Friedrich <[email protected]>

* Setting timezone based on IP geolocation now uses python3, fixes #862 (#864)
* Switched installation of tzupdate to python3, as py2 is no longer supported
  cdown/tzupdate#34

Signed-off-by: Holger Friedrich <[email protected]>

* Use Zulu API v1 when upgrading Java (#848)
Additionally, to clarify what Java version this will install, when
available, the API will prefer downloading a JRE. However, when a JRE is
not available it will use a JDK instead. However, when JDK's are
installed only the essential binaries are linked to update-alternatives
so extra JDK related software is unlinked (i.e. javac).

At the moment, Azul appears to only provide JDK builds for ARM platforms
and so, as such, ARM platforms are most often the ones to not get a JRE
installed and the resulting installation tends to be a bit larger (~100
MB).

One minor inconvenience is that with the current Azul API it does not
allow explicitly choosing builds without the JavaFX additional binaries.
So at times, the Java version installed will have extra JavaFX binaries.
This is usually seen when the architecture being installed is x86 based.

Fixes #714
Fixes #723
See Also #629

Signed-off-by: Ethan Dye <[email protected]>

* Refuse to install 64-bit JDK on 32-bit OS

armv8 builds in theory should work on the RPi3+/RPi4, however the
current Raspbian kernel uses a armv7l base which works because armv8 is
backwards compatible. However, this has the effect of making the builds
targeting aarch64 provided by Azul unable to work on the RPi3+/RPi4. On
the other hand, this is not a huge issue as the use of 64-bit Java on
low-memory boards brings few benefits and mostly issues.

Additionally, this adds checking for other platforms to ensure that the
OS is actually 64-bit before trying to install a 64-bit JDK. If the OS
is not actually 64-bit the installer defaults to installing a 32-bit
JDK.

Signed-off-by: Ethan Dye <[email protected]>

* fix nginx install (#867)

* add missing #REDIR to nginx.conf template

Signed-off-by: Markus Storm <[email protected]>

* fix install webif port in docs (#873)

Signed-off-by: Markus Storm <[email protected]>

* hotfix to download aarch32hf instead of sf on multiple returns in Azul REST API (#877)

Signed-off-by: Markus Storm <[email protected]>

* point to new openHABian debug guide

* point to new debug guide

* Remove python2 from openHABian (#876)

* replace all occurences of python and python-pip by python3 equivalent
* fixes #875 (compatibility with Ubuntu 20.04)
* timezone setting: added python3-setuptools before installing tzupdate
* java installer: show version after install

Signed-off-by: Holger Friedrich <[email protected]>

* Run apt-get update on startup in background (#724)

* move apt-get update to background on openhabian-config start, catch up in menu selections

Signed-off-by: Markus Storm <[email protected]>

* add intermediate output when selecting a menu option while apt-get update hasnt finished (#880)

Signed-off-by: Markus Storm <[email protected]>

* Use Markdown in LICENSE and update copyright year (#847)

Co-authored-by: Thomas Dietrich <[email protected]>

Signed-off-by: Ethan Dye <[email protected]>

* Remove setting gnuio options on serial ports (#883)

* Remove setting gnuio options on serial

Signed-off-by: Markus Storm <[email protected]>

* allow for disabling IPv6 in openhabian.conf (#888)

* allow for ipv6=disable in openhabian.conf

Signed-off-by: Markus Storm <[email protected]>

* allow for ipv6=disable in openhabian.conf (#891)

Signed-off-by: Markus Storm <[email protected]>

* installation of additional bluetooth packages on RPi (#898)

* python3-bluez not installed on stretch based installations, fixes #893
* additional bluetooth packages are now installed also on RPi4

Signed-off-by: Holger Friedrich <[email protected]>

* Fix bluetooth package installation

Signed-off-by: Holger Friedrich <[email protected]>

* return instead of exit if installing non existent BT packages fails (#903)

Signed-off-by: Markus Storm <[email protected]>

* add hw,hwarch,release parameters (#901)

* add hw, hwarch, release parameters to "fake" HW, OS

Signed-off-by: Markus Storm <[email protected]>

* added missing calls to apt-get update after adding repositories. (#911)

Fixes grafana install issue, #906.

Signed-off-by: Holger Friedrich <[email protected]>

* Add openhab-cli backup/restore to menu 50 (#910)

* added openhab-cli backup/restore implementation to 50 menu

Signed-off-by: Markus Storm <[email protected]>

* run Docker in foreground in BATS testing stage (#918)

* run Docker in foreground in BATS testing stage to get to see output in Travis builds
* allow for dev and BATS testing stages to fail while BATS tests still fail

Signed-off-by: Markus Storm <[email protected]>

* CORS fix (#830)

* fix CORS (#528)

Signed-off-by: Markus Storm <[email protected]>

* Grafana installation fixed (#915)

* wait for Grafana service to setup grafana.db before using grafana-cli to avoid side effects, fixes #914
* adapted bats test to check connection to InfluxDB, to store settings in Grafana, to validate connection and settings file grafana.db

Signed-off-by: Holger Friedrich <[email protected]>

* Grafana installation fixed (#925)

* race condition due to db migration during installer run, #921

Signed-off-by: Holger Friedrich <[email protected]>

* add RPi4 to bluetooth and WiFi functions; add CM1,CM3(+) support (#861)

* Add CM1,CM3(+) to supported models so now we support all RPis
* add RPi4 to bluetooth and WiFi functions
* add disable-wifi to option 36

Signed-off-by: Markus Storm <[email protected]>

* another instance of safe grep'ing (#929)

* fix another safe grep instance

Signed-off-by: Markus Storm <[email protected]>

* Insert missing semi-colons

Signed-off-by: Ethan Dye <[email protected]>

* Fixes in preparation of upcoming changes (#932)

* Fixes in preparation of upcoming changes

Signed-off-by: Ethan Dye <[email protected]>

* replace fstab by explicit systemd mount units to ensure proper order (#807)

* Replace fstab by explicit systemd units to ensure right mount order (#807)
  To ensure ZRAM and Samba properly work together on sharing
  /srv/openhab2-*, we need to change the order of mounts.
  As this cannot be done in fstab, I removed them and setup separate
  systemd mount units instead.

* change Samba shares
  Include logs, exclude /srv overview share, remove Samba defaults like printers

Signed-off-by: Markus Storm <[email protected]>

* intro stable branch (#882)

* introduce stable branch (#882)
* renamed mode parameter to debugmode; new values are off/on/maximum
* Add popup announcement function
* add docs/NEWSLOG.md

Signed-off-by: Markus Storm <[email protected]>

Co-authored-by: Holger Friedrich <[email protected]>
Co-authored-by: Ethan Dye <[email protected]>
Co-authored-by: Holger Friedrich <[email protected]>
mstormi added a commit to mstormi/openhabian that referenced this pull request May 30, 2020
@mstormi
replace fstab by explicit systemd mount units to ensure proper order (o…
9cefc0d 
…penhab#807)

* Replace fstab by explicit systemd units to ensure right mount order (openhab#807)
  To ensure ZRAM and Samba properly work together on sharing
  /srv/openhab2-*, we need to change the order of mounts.
  As this cannot be done in fstab, I removed them and setup separate
  systemd mount units instead.

* change Samba shares
  Include logs, exclude /srv overview share, remove Samba defaults like printers

Signed-off-by: Markus Storm <[email protected]>
Signed-off-by: Markus Storm <[email protected]>
mstormi added a commit to mstormi/openhabian that referenced this pull request Jun 10, 2020
@mstormi
replace fstab by explicit systemd mount units to ensure proper order (o…
4d733a0 
…penhab#807)

* Replace fstab by explicit systemd units to ensure right mount order (openhab#807)
  To ensure ZRAM and Samba properly work together on sharing
  /srv/openhab2-*, we need to change the order of mounts.
  As this cannot be done in fstab, I removed them and setup separate
  systemd mount units instead.

* change Samba shares
  Include logs, exclude /srv overview share, remove Samba defaults like printers

Signed-off-by: Markus Storm <[email protected]>
Signed-off-by: Markus Storm <[email protected]>
mstormi added a commit to mstormi/openhabian that referenced this pull request Jun 10, 2020
@mstormi
replace fstab by explicit systemd mount units to ensure proper order (o…
3c47bff 
…penhab#807)

* Replace fstab by explicit systemd units to ensure right mount order (openhab#807)
  To ensure ZRAM and Samba properly work together on sharing
  /srv/openhab2-*, we need to change the order of mounts.
  As this cannot be done in fstab, I removed them and setup separate
  systemd mount units instead.

* change Samba shares
  Include logs, exclude /srv overview share, remove Samba defaults like printers

Signed-off-by: Markus Storm <[email protected]>
Signed-off-by: Markus Storm <[email protected]>
@mstormi mstormi deleted the systemd-zram-mount-order branch March 7, 2021 17:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ecdye ecdye ecdye approved these changes

@BClark09 BClark09 Awaiting requested review from BClark09

@holgerfriedrich holgerfriedrich Awaiting requested review from holgerfriedrich

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Refinement and Refocus
Development

Successfully merging this pull request may close these issues.

/srv needs to be mounted AFTER ZRAM starts
2 participants
@mstormi @ecdye