diff options
| author | Jonathan Bauer | 2021-05-04 14:31:06 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2021-05-04 14:31:06 +0200 |
| commit | 9edb9e7edf996272ad2fdca573e874472fb8e226 (patch) | |
| tree | beed71f29f56fb21b2107d5e27b8a6bf031c15b6 /core/rootfs | |
| parent | Merge branch 'master' into installer (diff) | |
| parent | [run-virt-docker] change to new email address (diff) | |
| download | mltk-9edb9e7edf996272ad2fdca573e874472fb8e226.tar.gz mltk-9edb9e7edf996272ad2fdca573e874472fb8e226.tar.xz mltk-9edb9e7edf996272ad2fdca573e874472fb8e226.zip | |
Merge branch 'master' into installer
Diffstat (limited to 'core/rootfs')
3 files changed, 5 insertions, 2 deletions
diff --git a/core/rootfs/rootfs-stage31/data/init b/core/rootfs/rootfs-stage31/data/init index dd6484bc..5857362c 100755 --- a/core/rootfs/rootfs-stage31/data/init +++ b/core/rootfs/rootfs-stage31/data/init @@ -7,7 +7,7 @@ # See https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html # # If you have any feedback please consult https://bwlehrpool.de and -# send your feedback to bwlehrpool@hs-offenburg.de. +# send your feedback to support@bwlehrpool.de. # # General information about bwLehrpool can be found at https://bwlehrpool.de # diff --git a/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions b/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions index 5c579f05..e309ef84 100755 --- a/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions +++ b/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_partitions @@ -8,7 +8,7 @@ # See https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html # # If you have any feedback please consult https://bwlehrpool.de and -# send your feedback to bwlehrpool@hs-offenburg.de. +# send your feedback to support@bwlehrpool.de. # # General information about bwLehrpool can be found at https://bwlehrpool.de # diff --git a/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons b/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons index 228474f2..91ec0d0b 100755 --- a/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons +++ b/core/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons @@ -98,12 +98,15 @@ fi # Run post-hook if available if [ -x "$ADDON_MOUNT_POINT/addon-init" ]; then + echo "Running post-append hook" "$ADDON_MOUNT_POINT/addon-init" || \ slxlog --echo "addon-setup-init" "Warning: Could not execute addon-init of $ADDON" fi if ! grep -q -F '/opt/openslx/mnt/stage4' '/proc/mounts'; then + echo "Running ldconfig" ldconfig 2> /dev/null || ldconfig.real 2> /dev/null fi +echo "Addon initialized." exit 0 |